Changeset 18224

Show
Ignore:
Timestamp:
17.12.2008 14:32:32 (10 years ago)
Author:
mdewsnip
Message:

GRRRR -- fixed up a whole lot more inconsistencies in the Makefiles. These were all perfect before the build-src/common-src/runtime-src split!!

Location:
gsdl/trunk
Files:
8 modified

Legend:

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

    r18029 r18224  
    11########################################################################### 
    22# 
    3 # Makefile -- src/gdbmedit/db2txt 
     3# Makefile -- common-src/src/gdbmedit/db2txt 
    44# A component of the Greenstone digital library software 
    55# from the New Zealand Digital Library Project at the 
     
    2727GSDL_DIR = ../../../.. 
    2828COMMON_DIR = $(GSDL_DIR)/common-src 
    29 GDBM_DIR = $(COMMON_DIR)/packages/gdbm 
     29 
     30COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 
     31 
    3032 
    3133CXX = @CXX@ 
     
    3335DEFS = @DEFS@ 
    3436GSDLOS = @gsdlos@ 
    35 INCLUDES = -I$(GDBM_DIR)/include -I$(COMMON_DIR)/src/lib 
     37INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib 
    3638INSTALL = @INSTALL@ 
    3739LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
    38 LIBS = @LIBS@ $(GDBM_DIR)/lib/libgdbm.a 
     40LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 
    3941 
    4042 
  • gsdl/trunk/common-src/src/gdbmedit/gdbmget/Makefile.in

    r18029 r18224  
    11########################################################################### 
    22# 
    3 # Makefile -- src/gdbmedit/gdbmget 
     3# Makefile -- common-src/src/gdbmedit/gdbmget 
    44# A component of the Greenstone digital library software 
    55# from the New Zealand Digital Library Project at the 
     
    2727GSDL_DIR = ../../../.. 
    2828COMMON_DIR = $(GSDL_DIR)/common-src 
    29 GDBM_DIR = $(COMMON_DIR)/packages/gdbm 
     29 
     30COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 
     31 
    3032 
    3133CXX = @CXX@ 
     
    3335DEFS = @DEFS@ 
    3436GSDLOS = @gsdlos@ 
    35 INCLUDES = -I$(GDBM_DIR)/include -I$(COMMON_DIR)/src/lib 
     37INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib 
    3638INSTALL = @INSTALL@ 
    3739LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
    38 LIBS = @LIBS@ $(GDBM_DIR)/lib/libgdbm.a 
     40LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 
    3941 
    4042 
  • gsdl/trunk/common-src/src/gdbmedit/gdbmset/Makefile.in

    r18029 r18224  
    11########################################################################### 
    22# 
    3 # Makefile -- src/gdbmedit/gdbmset 
     3# Makefile -- common-src/src/gdbmedit/gdbmset 
    44# A component of the Greenstone digital library software 
    55# from the New Zealand Digital Library Project at the 
     
    2727GSDL_DIR = ../../../.. 
    2828COMMON_DIR = $(GSDL_DIR)/common-src 
    29 GDBM_DIR = $(COMMON_DIR)/packages/gdbm 
     29 
     30COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 
     31 
    3032 
    3133CXX = @CXX@ 
     
    3335DEFS = @DEFS@ 
    3436GSDLOS = @gsdlos@ 
    35 INCLUDES = -I$(GDBM_DIR)/include -I$(COMMON_DIR)/src/lib 
     37INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib 
    3638INSTALL = @INSTALL@ 
    3739LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
    38 LIBS = @LIBS@ $(GDBM_DIR)/lib/libgdbm.a 
     40LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 
    3941 
    4042 
  • gsdl/trunk/common-src/src/gdbmedit/txt2db/Makefile.in

    r18029 r18224  
    11########################################################################### 
    22# 
    3 # Makefile -- src/gdbmedit/txt2db 
     3# Makefile -- common-src/src/gdbmedit/txt2db 
    44# A component of the Greenstone digital library software 
    55# from the New Zealand Digital Library Project at the 
     
    2727GSDL_DIR = ../../../.. 
    2828COMMON_DIR = $(GSDL_DIR)/common-src 
    29 GDBM_DIR = $(COMMON_DIR)/packages/gdbm 
     29 
     30COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 
     31 
    3032 
    3133CXX = @CXX@ 
     
    3335DEFS = @DEFS@ 
    3436GSDLOS = @gsdlos@ 
    35 INCLUDES = -I$(GDBM_DIR)/include -I$(COMMON_DIR)/src/lib 
     37INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib 
    3638INSTALL = @INSTALL@ 
    3739LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
    38 LIBS = @LIBS@ $(GDBM_DIR)/lib/libgdbm.a 
     40LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 
    3941 
    4042 
  • gsdl/trunk/common-src/src/lib/Makefile.in

    r15910 r18224  
    11########################################################################### 
    22# 
    3 # Makefile -- lib 
     3# Makefile -- common-src/src/lib 
    44# A component of the Greenstone digital library software 
    55# from the New Zealand Digital Library Project at the 
     
    2525########################################################################### 
    2626 
    27 GSDL_DIR = ../.. 
    28 INDEXERS_DIR = $(GSDL_DIR)/indexers 
    29 PACKAGES_DIR = $(GSDL_DIR)/packages 
     27GSDL_DIR = ../../.. 
     28COMMON_DIR = $(GSDL_DIR)/common-src 
     29 
     30INDEXERS_DIR = $(COMMON_DIR)/indexers 
     31COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 
    3032 
    3133 
    3234USE_SQLITE = @USE_SQLITE@ 
    3335ifeq ($(USE_SQLITE), 1) 
    34 SQLITE_INCLUDES = -I$(PACKAGES_DIR)/sqlite/include 
     36SQLITE_INCLUDES = -I$(COMMON_PACKAGES_DIR)/sqlite/include 
    3537SQLITE_OBJECTS = sqlitedbclass.o 
    3638SQLITE_SOURCES = sqlitedbclass.cpp 
     
    4648CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ 
    4749DEFS = @DEFS@ 
    48 INCLUDES = @GDBM_INCLUDE@ -I$(GSDL_DIR) -I$(INDEXERS_DIR)/mg/lib $(SQLITE_INCLUDES) 
     50INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(INDEXERS_DIR)/mg/lib $(SQLITE_INCLUDES) 
    4951RANLIB = @RANLIB@ 
    5052 
  • gsdl/trunk/runtime-src/src/colservr/Makefile.in

    r16624 r18224  
    11########################################################################### 
    22# 
    3 # Makefile -- src/colservr 
     3# Makefile -- runtime-src/src/colservr 
    44# A component of the Greenstone digital library software 
    55# from the New Zealand Digital Library Project at the 
     
    2929 
    3030INDEXERS_DIR = $(COMMON_DIR)/indexers 
    31 COMMON_PACKAGES = $(COMMON_DIR)/packages 
    32 PACKAGES_DIR = $(GSDL_DIR)/runtime-src/packages 
     31COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 
    3332 
    3433 
     
    3635ifeq ($(USE_SQLITE), 1) 
    3736SQLITE_DEFINES = -DUSE_SQLITE 
    38 SQLITE_INCLUDES = -I$(COMMON_PACKAGES)/sqlite/include 
     37SQLITE_INCLUDES = -I$(COMMON_PACKAGES_DIR)/sqlite/include 
    3938else 
    4039SQLITE_DEFINES =  
     
    5049DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(SQLITE_DEFINES) 
    5150# Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist! 
    52 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \ 
     51INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COMMON_PACKAGES_DIR)/gdbm/include \ 
    5352    -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \ 
    5453    -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text \ 
    55     -I$(PACKAGES_DIR)/expat/include $(SQLITE_INCLUDES) 
     54    -I$(COMMON_PACKAGES_DIR)/expat/include $(SQLITE_INCLUDES) 
    5655RANLIB = @RANLIB@ 
    5756 
  • gsdl/trunk/runtime-src/src/protocol/Makefile.in

    r16572 r18224  
    11########################################################################### 
    22# 
    3 # Makefile -- src/protocol 
     3# Makefile -- runtime-src/src/protocol 
    44# A component of the Greenstone digital library software 
    55# from the New Zealand Digital Library Project at the 
     
    2727GSDL_DIR = ../../.. 
    2828COMMON_DIR = $(GSDL_DIR)/common-src 
     29RUNTIME_DIR = $(GSDL_DIR)/runtime-src 
    2930 
    3031INDEXERS_DIR = $(COMMON_DIR)/indexers 
    31 PACKAGES_DIR = $(GSDL_DIR)/runtime-src/packages 
    32 COLSERVR_DIR = $(GSDL_DIR)/runtime-src/src/colservr 
     32COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 
     33COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr 
    3334 
    3435 
     
    3839DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER 
    3940# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! 
    40 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(INDEXERS_DIR)/mgpp/text 
     41INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COMMON_PACKAGES_DIR)/gdbm/include \ 
     42    -I$(COLSERVR_DIR) -I$(INDEXERS_DIR)/mgpp/text 
    4143RANLIB = @RANLIB@ 
    4244 
  • gsdl/trunk/runtime-src/src/recpt/Makefile.in

    r18030 r18224  
    11########################################################################### 
    22# 
    3 # Makefile -- src/recpt 
     3# Makefile -- runtime-src/src/recpt 
    44# A component of the Greenstone digital library software 
    55# from the New Zealand Digital Library Project at the 
     
    8080CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ 
    8181DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(Z3950_DEFS) 
    82 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \ 
     82INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COMMON_PACKAGES_DIR)/gdbm/include \ 
    8383        -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \ 
    8484    -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mgpp/text \ 
     
    8686INSTALL = @INSTALL@ 
    8787LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
    88 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) \ 
    89     $(FASTCGI_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS) 
     88LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \ 
     89    $(ACCENTFOLD_LIBS) $(FASTCGI_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS) 
    9090RANLIB = @RANLIB@ 
    9191