Changeset 15932


Ignore:
Timestamp:
2008-06-09T15:35:59+12:00 (16 years ago)
Author:
mdewsnip
Message:

Tidied up "gdbmget" and "gdbmset" Makefiles, and made these get compiled automatically.

Location:
gsdl/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/Makefile.in

    r15907 r15932  
    5252COMPILEDIRS = packages src/lib src/gdbmedit/txt2db src/gdbmedit/db2txt src/hashfile src/getpw src/phind/generate src/colservr src/protocol src/z3950 src/recpt src/corba src/oaiservr
    5353# a subset of the directories get installed
    54 INSTALLDIRS = packages src/gdbmedit/txt2db src/gdbmedit/db2txt src/hashfile src/getpw src/phind/generate src/z3950 src/recpt src/corba src/oaiservr
     54INSTALLDIRS = packages src/gdbmedit/db2txt src/gdbmedit/txt2db src/gdbmedit/gdbmget src/gdbmedit/gdbmset src/hashfile src/getpw src/phind/generate src/z3950 src/recpt src/corba src/oaiservr
    5555
    5656MODULEDIRS = @MODULEDIRS@

  • gsdl/trunk/configure

    r15908 r15932  
    74607460         src/gdbmedit/db2txt/Makefile \
    74617461         src/gdbmedit/txt2db/Makefile \
     7462         src/gdbmedit/gdbmget/Makefile \
     7463         src/gdbmedit/gdbmset/Makefile \
    74627464         src/oaiservr/Makefile \
    74637465         src/z3950/Makefile \

  • gsdl/trunk/configure.in

    r15908 r15932  
    465465         src/gdbmedit/db2txt/Makefile \
    466466         src/gdbmedit/txt2db/Makefile \
     467         src/gdbmedit/gdbmget/Makefile \
     468         src/gdbmedit/gdbmset/Makefile \
    467469         src/oaiservr/Makefile \
    468470         src/z3950/Makefile \

  • gsdl/trunk/src/gdbmedit/gdbmget/Makefile.in

    r15551 r15932  
    11###########################################################################
    22#
    3 # Makefile -- Makefile for db2txt
     3# Makefile -- src/gdbmedit/gdbmget
    44# A component of the Greenstone digital library software
    55# from the New Zealand Digital Library Project at the
    66# University of Waikato, New Zealand.
    77#
    8 # Copyright (C) 1999 Rodger McNab, Stefan Boddie
     8# Copyright (C) 1999-2008  The New Zealand Digital Library Project
    99#
    1010#
    … …  
    2323# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    2424#
    25 #       @(#)Makefile.in 1.3 16 Mar 1994
    26 #
    2725###########################################################################
    2826
    29  
    30 AR = ar
    31 CC = @CC@
     27GSDL_DIR = ../../..
     28
     29
    3230CXX = @CXX@
    33 CFLAGS = -Wall @CFLAGS@ @COMPAT32BITFLAGS@
    34 CXXFLAGS = -Wall @CXXFLAGS@ @COMPAT32BITFLAGS@
     31CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    3532DEFS = @DEFS@
    36 RANLIB = @RANLIB@
    37 INCLUDES = -I../../lib @GDBM_INCLUDE@
     33GSDLOS = @gsdlos@
     34INCLUDES = @GDBM_INCLUDE@ -I$(GSDL_DIR)/src/lib
     35INSTALL = @INSTALL@
    3836LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    39 DPLIBS =
    4037LIBS = @GDBM_LIBPATH@ -lgdbm @LIBS@
    41 GSDLOS = @gsdlos@
    42 INSTALL = @INSTALL@
    43  
    44 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
    45 CXXCOMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS)
    46 LINK = $(CC) $(LDFLAGS) -o $@
     38
     39
     40CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
    4741CXXLINK = $(CXX) $(LDFLAGS) -o $@
    48  
     42
     43
    4944.SUFFIXES:
    50 .SUFFIXES: .c .o
    51 .c.o:
    52     $(COMPILE) $<
    53 
    5445.SUFFIXES: .cpp .o
    5546.cpp.o:
    5647    $(CXXCOMPILE) $<
    57  
    5848
    59 HEADERS =
    6049
    61 SOURCES = gdbmget.cpp
     50SOURCES = \
     51    gdbmget.cpp
    6252
    63 OBJECTS = gdbmget.o
     53OBJECTS = \
     54    gdbmget.o \
    6455
    65 EXEC    = gdbmget
    66  
    67 all : $(EXEC)
     56EXECUTABLE_OBJECTS = \
     57    $(OBJECTS)
    6858
    69 install: $(EXEC)
    70     $(INSTALL) -d ../../bin/$(GSDLOS)
    71     $(INSTALL) -m 755 -s $(EXEC) ../../bin/$(GSDLOS)
     59EXECUTABLE = gdbmget
     60
     61
     62# Default target: make the gdbmget executable
     63all: $(EXECUTABLE)
     64
     65gdbmget: $(EXECUTABLE_OBJECTS)
     66    $(CXXLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
     67
     68install: $(EXECUTABLE)
     69    $(INSTALL) -d $(GSDL_DIR)/bin/$(GSDLOS)
     70    $(INSTALL) -m 755 -s $(EXECUTABLE) $(GSDL_DIR)/bin/$(GSDLOS)
     71
     72clean:
     73    rm -f $(OBJECTS) $(EXECUTABLE)
    7274
    7375distclean:
    74     rm -f $(OBJECTS) $(EXEC) Makefile
    75 
    76 clean:
    77     rm -f $(OBJECTS) $(EXEC)
     76    rm -f $(OBJECTS) $(EXECUTABLE) Makefile
    7877
    7978depend:
    80     makedepend -Y -- $(DEFS) $(INCLUDES) $(CFLAGS) -- $(SOURCES)
    81 
    82 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    83 
    84 GDBMGET_OBJS = gdbmget.o
    85 
    86 gdbmget: $(GDBMGET_OBJS) $(DPLIBS)
    87     $(LINK) $(GDBMGET_OBJS) $(LIBS)
     79    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)

  • gsdl/trunk/src/gdbmedit/gdbmget/gdbmget.cpp

    r15230 r15932  
    9797        }
    9898      printf("\n");
    99       free(value.dptri);
     99      // ?? free(value.dptri);
    100100    }
    101101  else

  • gsdl/trunk/src/gdbmedit/gdbmset/Makefile.in

    r15551 r15932  
    11###########################################################################
    22#
    3 # Makefile -- Makefile for db2txt
     3# Makefile -- src/gdbmedit/gdbmset
    44# A component of the Greenstone digital library software
    55# from the New Zealand Digital Library Project at the
    66# University of Waikato, New Zealand.
    77#
    8 # Copyright (C) 1999 Rodger McNab, Stefan Boddie
     8# Copyright (C) 1999-2008  The New Zealand Digital Library Project
    99#
    1010#
    … …  
    2323# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    2424#
    25 #       @(#)Makefile.in 1.3 16 Mar 1994
    26 #
    2725###########################################################################
    2826
    29  
    30 AR = ar
    31 CC = @CC@
     27GSDL_DIR = ../../..
     28
     29
    3230CXX = @CXX@
    33 CFLAGS = -Wall @CFLAGS@ @COMPAT32BITFLAGS@
    34 CXXFLAGS = -Wall @CXXFLAGS@ @COMPAT32BITFLAGS@
     31CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    3532DEFS = @DEFS@
    36 RANLIB = @RANLIB@
    37 INCLUDES = -I../../lib @GDBM_INCLUDE@
     33GSDLOS = @gsdlos@
     34INCLUDES = @GDBM_INCLUDE@ -I$(GSDL_DIR)/src/lib
     35INSTALL = @INSTALL@
    3836LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    39 DPLIBS =
    4037LIBS = @GDBM_LIBPATH@ -lgdbm @LIBS@
    41 GSDLOS = @gsdlos@
    42 INSTALL = @INSTALL@
    43  
    44 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
    45 CXXCOMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS)
    46 LINK = $(CC) $(LDFLAGS) -o $@
     38
     39
     40CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
    4741CXXLINK = $(CXX) $(LDFLAGS) -o $@
    48  
     42
     43
    4944.SUFFIXES:
    50 .SUFFIXES: .c .o
    51 .c.o:
    52     $(COMPILE) $<
    53 
    5445.SUFFIXES: .cpp .o
    5546.cpp.o:
    5647    $(CXXCOMPILE) $<
    57  
    5848
    59 HEADERS =
    6049
    61 SOURCES = gdbmset.cpp
     50SOURCES = \
     51    gdbmset.cpp
    6252
    63 OBJECTS = gdbmset.o
     53OBJECTS = \
     54    gdbmset.o \
    6455
    65 EXEC    = gdbmset
    66  
    67 all : $(EXEC)
     56EXECUTABLE_OBJECTS = \
     57    $(OBJECTS)
    6858
    69 install: $(EXEC)
    70     $(INSTALL) -d ../../bin/$(GSDLOS)
    71     $(INSTALL) -m 755 -s $(EXEC) ../../bin/$(GSDLOS)
     59EXECUTABLE = gdbmset
     60
     61
     62# Default target: make the gdbmset executable
     63all: $(EXECUTABLE)
     64
     65gdbmset: $(EXECUTABLE_OBJECTS)
     66    $(CXXLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
     67
     68install: $(EXECUTABLE)
     69    $(INSTALL) -d $(GSDL_DIR)/bin/$(GSDLOS)
     70    $(INSTALL) -m 755 -s $(EXECUTABLE) $(GSDL_DIR)/bin/$(GSDLOS)
     71
     72clean:
     73    rm -f $(OBJECTS) $(EXECUTABLE)
    7274
    7375distclean:
    74     rm -f $(OBJECTS) $(EXEC) Makefile
    75 
    76 clean:
    77     rm -f $(OBJECTS) $(EXEC)
     76    rm -f $(OBJECTS) $(EXECUTABLE) Makefile
    7877
    7978depend:
    80     makedepend -Y -- $(DEFS) $(INCLUDES) $(CFLAGS) -- $(SOURCES)
    81 
    82 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    83 
    84 GDBMSET_OBJS = gdbmset.o
    85 
    86 gdbmset: $(GDBMSET_OBJS) $(DPLIBS)
    87     $(LINK) $(GDBMSET_OBJS) $(LIBS)
     79    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)
Note: See TracChangeset for help on using the changeset viewer.