Changeset 18029


Ignore:
Timestamp:
12/03/08 11:31:44 (12 years ago)
Author:
mdewsnip
Message:

Modified Makefiles to use the new GDBM package in the common-src/packages/gdbm directory.

Location:
gsdl/trunk/common-src/src/gdbmedit
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/common-src/src/gdbmedit/db2txt/Makefile.in

    r16605 r18029  
    2727GSDL_DIR = ../../../..
    2828COMMON_DIR = $(GSDL_DIR)/common-src
     29GDBM_DIR = $(COMMON_DIR)/packages/gdbm
    2930
    3031CXX = @CXX@
     
    3233DEFS = @DEFS@
    3334GSDLOS = @gsdlos@
    34 INCLUDES = @GDBM_INCLUDE@ -I$(COMMON_DIR)/src/lib
     35INCLUDES = -I$(GDBM_DIR)/include -I$(COMMON_DIR)/src/lib
    3536INSTALL = @INSTALL@
    3637LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    37 LIBS = @GDBM_LIBPATH@ -lgdbm @LIBS@
     38LIBS = @LIBS@ $(GDBM_DIR)/lib/libgdbm.a
    3839
    3940
  • gsdl/trunk/common-src/src/gdbmedit/gdbmget/Makefile.in

    r16605 r18029  
    2727GSDL_DIR = ../../../..
    2828COMMON_DIR = $(GSDL_DIR)/common-src
     29GDBM_DIR = $(COMMON_DIR)/packages/gdbm
    2930
    3031CXX = @CXX@
     
    3233DEFS = @DEFS@
    3334GSDLOS = @gsdlos@
    34 INCLUDES = @GDBM_INCLUDE@ -I$(COMMON_DIR)/src/lib
     35INCLUDES = -I$(GDBM_DIR)/include -I$(COMMON_DIR)/src/lib
    3536INSTALL = @INSTALL@
    3637LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    37 LIBS = @GDBM_LIBPATH@ -lgdbm @LIBS@
     38LIBS = @LIBS@ $(GDBM_DIR)/lib/libgdbm.a
    3839
    3940
  • gsdl/trunk/common-src/src/gdbmedit/gdbmset/Makefile.in

    r16605 r18029  
    2727GSDL_DIR = ../../../..
    2828COMMON_DIR = $(GSDL_DIR)/common-src
     29GDBM_DIR = $(COMMON_DIR)/packages/gdbm
    2930
    3031CXX = @CXX@
     
    3233DEFS = @DEFS@
    3334GSDLOS = @gsdlos@
    34 INCLUDES = @GDBM_INCLUDE@ -I$(COMMON_DIR)/src/lib
     35INCLUDES = -I$(GDBM_DIR)/include -I$(COMMON_DIR)/src/lib
    3536INSTALL = @INSTALL@
    3637LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    37 LIBS = @GDBM_LIBPATH@ -lgdbm @LIBS@
     38LIBS = @LIBS@ $(GDBM_DIR)/lib/libgdbm.a
    3839
    3940
  • gsdl/trunk/common-src/src/gdbmedit/txt2db/Makefile.in

    r16606 r18029  
    2727GSDL_DIR = ../../../..
    2828COMMON_DIR = $(GSDL_DIR)/common-src
    29 INDEXERS_DIR = $(COMMON_DIR)/indexers
    30 
     29GDBM_DIR = $(COMMON_DIR)/packages/gdbm
    3130
    3231CXX = @CXX@
     
    3433DEFS = @DEFS@
    3534GSDLOS = @gsdlos@
    36 INCLUDES = @GDBM_INCLUDE@ -I$(COMMON_DIR)/src/lib
     35INCLUDES = -I$(GDBM_DIR)/include -I$(COMMON_DIR)/src/lib
    3736INSTALL = @INSTALL@
    3837LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    39 LIBS = @GDBM_LIBPATH@ -lgdbm @LIBS@
     38LIBS = @LIBS@ $(GDBM_DIR)/lib/libgdbm.a
    4039
    4140
     
    5857GSDL_LIBS = \
    5958    $(COMMON_DIR)/src/lib/gsdllib.a \
    60     $(INDEXERS_DIR)/mg/lib/libmglib.a
     59    $(COMMON_DIR)/indexers/mg/lib/libmglib.a
    6160
    6261EXECUTABLE_OBJECTS = \
Note: See TracChangeset for help on using the changeset viewer.