Changeset 22078

Show
Ignore:
Timestamp:
12.05.2010 20:33:31 (9 years ago)
Author:
ak19
Message:

1. Missing conditional LIBS or INCLUDES or DIR declaration for when USE_GDBM is switched on. Previously it used to always put these in the includes/libs, not it only does so on USE_GDBM.

Location:
main/trunk/greenstone2/runtime-src/src
Files:
9 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/src/oaiservr/Makefile.in

    r22058 r22078  
    6565ifeq ($(USE_GDBM), 1) 
    6666GDBM_DEFINES = -DUSE_GDBM 
     67GDBM_LIBS = $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 
    6768else 
    6869GDBM_DEFINES =  
     70GDBM_LIBS = 
    6971endif 
    7072 
     
    9395INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) $(MGPP_INCLUDES) 
    9496LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
    95 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \ 
     97LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \ 
    9698    $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 
    9799INSTALL = @INSTALL@ 
  • main/trunk/greenstone2/runtime-src/src/oaiservr/win32.mak

    r21945 r22078  
    4343DLLDEBUG = 0 
    4444ENABLE_ACCENTFOLD = 1 
     45USE_GDBM = 1 
     46USE_JDBM = 1 
    4547USE_SQLITE = 1 
     48USE_MSSQL = 0 
    4649ENABLE_MG = 1 
    4750ENABLE_MGPP = 1 
     
    7477!ENDIF 
    7578 
     79!IF $(USE_GDBM) 
     80GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \ 
     81    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" 
     82GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" 
     83GDBM_DEFINES = -DUSE_GDBM 
     84!ELSE 
     85GDBM_INCLUDES =  
     86GDBM_LIBS =  
     87GDBM_DEFINES = 
     88!ENDIF 
     89 
     90!IF $(USE_JDBM) 
     91JDBM_DEFINES = -DUSE_JDBM 
     92!ELSE 
     93JDBM_DEFINES = 
     94!ENDIF 
     95 
    7696!IF $(USE_SQLITE) 
    7797SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 
     98SQLITE_DEFINES = -DUSE_SQLITE 
    7899!ELSE 
    79100SQLITE_LIBS =  
     101SQLITE_DEFINES = 
     102!ENDIF 
     103 
     104!IF $(USE_MSSQL) 
     105MSSQL_DEFINES = -DUSE_MSSQL 
     106!ELSE 
     107MSSQL_DEFINES = 
    80108!ENDIF 
    81109 
     
    110138CC = cl 
    111139DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 
    112         -DGSDL_NOCACHE $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 
     140        -DGSDL_NOCACHE $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \ 
     141    $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 
    113142INCLUDES = -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \ 
    114143        $(MGPP_INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" \ 
    115     -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \ 
     144    $(GDBM_INCLUDES) \ 
    116145    -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" 
    117146LDFLAGS =  
    118147LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 
    119         "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 
     148        $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 
    120149 
    121150!IF $(GSDL_VC4) 
  • main/trunk/greenstone2/runtime-src/src/protocol/Makefile.in

    r22058 r22078  
    4343ifeq ($(USE_GDBM), 1) 
    4444GDBM_DEFINES = -DUSE_GDBM 
     45GDBM_INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include 
    4546else 
    4647GDBM_DEFINES =  
     48GDBM_INCLUDES = 
    4749endif 
    4850 
     
    6769DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 
    6870# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! 
    69 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COMMON_PACKAGES_DIR)/gdbm/include \ 
     71INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib $(GDBM_INCLUDES) \ 
    7072    -I$(COLSERVR_DIR) $(MGPP_INCLUDES) 
    7173RANLIB = @RANLIB@ 
  • main/trunk/greenstone2/runtime-src/src/protocol/win32.mak

    r21945 r22078  
    3838DLL = 0 
    3939DLLDEBUG = 0 
     40USE_GDBM = 1 
     41USE_JDBM = 1 
     42USE_SQLITE = 1 
     43USE_MSSQL = 0 
    4044ENABLE_MG = 1 
    4145ENABLE_MGPP = 1 
     
    6064CXXFLAGS = $(CXXFLAGS) -MDd 
    6165!ENDIF 
     66!ENDIF 
     67 
     68!IF $(USE_GDBM) 
     69GDBM_DEFINES = -DUSE_GDBM 
     70GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm 
     71!ELSE 
     72GDBM_DEFINES =  
     73GDBM_INCLUDES =  
     74!ENDIF 
     75 
     76!IF $(USE_JDBM) 
     77JDBM_DEFINES = -DUSE_JDBM 
     78!ELSE 
     79JDBM_DEFINES =  
     80!ENDIF 
     81 
     82!IF $(USE_SQLITE) 
     83SQLITE_DEFINES = -DUSE_SQLITE 
     84!ELSE 
     85SQLITE_DEFINES =  
     86!ENDIF 
     87 
     88!IF $(USE_MSSQL) 
     89MSSQL_DEFINES = -DUSE_MSSQL 
     90!ELSE 
     91MSSQL_DEFINES =  
    6292!ENDIF 
    6393 
     
    85115CC = cl 
    86116DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 
     117    $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \ 
    87118    $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 
    88119# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! 
    89120INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" $(MGPP_INCLUDES) \ 
    90      -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm" 
     121     $(GDBM_INCLUDES) 
    91122 
    92123!IF $(GSDL_VC4) 
  • main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in

    r22058 r22078  
    8585GDBM_DEFINES = -DUSE_GDBM 
    8686GDBM_INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include 
     87GDBM_LIBS = $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 
    8788else 
    8889GDBM_DEFINES =  
    8990GDBM_INCLUDES =  
     91GDBM_LIBS =  
    9092endif 
    9193 
     
    155157INSTALL = @INSTALL@ 
    156158LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
    157 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a \ 
     159LIBS = @LIBS@ $(GDBM_LIBS) \ 
    158160    $(COMMON_PACKAGES_DIR)/expat/lib/libexpat.a \ 
    159161    $(ACCENTFOLD_LIBS) $(FASTCGI_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS) 
  • main/trunk/greenstone2/runtime-src/src/recpt/win32.mak

    r22066 r22078  
    4545ENABLE_ACCENTFOLD = 1 
    4646USE_GDBM = 1 
     47USE_JDBM = 1 
    4748USE_SQLITE = 1 
     49USE_MSSQL = 0 
    4850ENABLE_MG = 1 
    4951ENABLE_MGPP = 1 
     
    7880!IF $(USE_GDBM) 
    7981GDBM_DEFINES = -DUSE_GDBM 
     82GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" 
    8083GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" 
    8184!ELSE 
    8285GDBM_DEFINES =  
     86GDBM_LIBS =  
    8387GDBM_INCLUDES =  
     88!ENDIF 
     89 
     90!IF $(USE_JDBM) 
     91JDBM_DEFINES = -DUSE_JDBM 
     92!ELSE 
     93JDBM_DEFINES =  
    8494!ENDIF 
    8595 
     
    94104SQL_OBJECTS = 
    95105SQLITE_LIBS =  
     106!ENDIF 
     107 
     108!IF $(USE_MSSQL) 
     109MSSQL_DEFINES = -DUSE_MSSQL 
     110!ELSE 
     111MSSQL_DEFINES =  
    96112!ENDIF 
    97113 
     
    142158CC = cl 
    143159DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 
    144         -DGSDL_NOCACHE $(GDBM_DEFINES) $(Z3950_DEFS) $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 
     160        -DGSDL_NOCACHE $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \ 
     161    $(Z3950_DEFS) $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 
    145162INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ 
    146163    $(MG_INCLUDES) $(MGPP_INCLUDES) \ 
     
    150167LDFLAGS =  
    151168LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 
    152         "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS) 
     169       $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS) 
    153170 
    154171!IF $(GSDL_VC4) 
  • main/trunk/greenstone2/runtime-src/src/w32server/win32.mak

    r21945 r22078  
    4040DEBUG = 0 
    4141ENABLE_ACCENTFOLD = 1 
     42USE_GDBM = 1 
     43USE_JDBM = 1 
    4244USE_SQLITE = 1 
     45USE_MSSQL = 0 
    4346ENABLE_MG = 1 
    4447ENABLE_MGPP = 1 
     
    6669!ENDIF 
    6770 
     71!IF $(USE_GDBM) 
     72GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \ 
     73    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" 
     74GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" 
     75GDBM_DEFINES = -DUSE_GDBM 
     76!ELSE 
     77GDBM_INCLUDES =  
     78GDBM_LIBS =  
     79GDBM_DEFINES = 
     80!ENDIF 
     81 
     82!IF $(USE_JDBM) 
     83JDBM_DEFINES = -DUSE_JDBM 
     84!ELSE 
     85JDBM_DEFINES = 
     86!ENDIF 
     87 
    6888!IF $(USE_SQLITE) 
    6989SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 
     90SQLITE_DEFINES = -DUSE_SQLITE 
    7091!ELSE 
    7192SQLITE_LIBS =  
     93SQLITE_DEFINES = 
     94!ENDIF 
     95 
     96!IF $(USE_MSSQL) 
     97MSSQL_DEFINES = -DUSE_MSSQL 
     98!ELSE 
     99MSSQL_DEFINES = 
    72100!ENDIF 
    73101 
     
    103131CC = cl 
    104132DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_LITTLE_ENDIAN -DPARADOCNUM -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 
     133    $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \ 
    105134    $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 
    106135INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \ 
    107     -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \ 
     136    $(GDBM_INCLUDES) \   
    108137    -I"$(COLSERVR_DIR)" \ 
    109138    $(MG_INCLUDES) \ 
     
    111140 
    112141LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 
    113         "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 
     142        $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 
    114143RSC = rc 
    115144WINLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib \ 
  • main/trunk/greenstone2/runtime-src/src/z3950/Makefile.in

    r22058 r22078  
    6464USE_GDBM = @USE_GDBM@ 
    6565ifeq ($(USE_GDBM), 1) 
     66GDBM_LIBS = $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 
    6667GDBM_DEFINES = -DUSE_GDBM 
    6768else 
     69GDBM_LIBS = 
    6870GDBM_DEFINES =  
    6971endif 
     
    9294CFLAGS = @CFLAGS@ 
    9395CPPFLAGS = @CXXFLAGS@ 
    94 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)  
     96DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 
    9597GSDLOS = @gsdlos@ 
    9698# Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! 
     
    100102INSTALL = @INSTALL@ 
    101103LDFLAGS = @LDFLAGS@ 
    102 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \ 
     104LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \ 
    103105    $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) \ 
    104106    $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a $(RUNTIME_PACKAGES_DIR)/d2m/libd2m.a -lxml2 
  • main/trunk/greenstone2/runtime-src/src/z3950/win32.mak

    r21945 r22078  
    4141DLLDEBUG = 0 
    4242ENABLE_ACCENTFOLD = 1 
     43USE_GDBM = 1 
     44USE_JDBM = 1 
    4345USE_SQLITE = 1 
     46USE_MSSQL = 0 
    4447ENABLE_MG = 1 
    4548ENABLE_MGPP = 1 
     
    7275!ENDIF 
    7376 
     77!IF $(USE_GDBM) 
     78GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \ 
     79    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" 
     80GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" 
     81GDBM_DEFINES = -DUSE_GDBM 
     82!ELSE 
     83GDBM_INCLUDES =  
     84GDBM_LIBS =  
     85GDBM_DEFINES = 
     86!ENDIF 
     87 
     88!IF $(USE_JDBM) 
     89JDBM_DEFINES = -DUSE_JDBM 
     90!ELSE 
     91JDBM_DEFINES = 
     92!ENDIF 
     93 
    7494!IF $(USE_SQLITE) 
    75 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 
     95SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib 
     96SQLITE_DEFINES = -DUSE_SQLITE 
    7697!ELSE 
    7798SQLITE_LIBS =  
     99SQLITE_DEFINES = 
     100!ENDIF 
     101 
     102!IF $(USE_MSSQL) 
     103MSSQL_DEFINES = -DUSE_MSSQL 
     104!ELSE 
     105MSSQL_DEFINES = 
    78106!ENDIF 
    79107 
     
    107135CC = cl 
    108136DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 
     137    $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \ 
    109138    $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 
    110139# Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! 
     
    112141    $(MGPP_INCLUDES) -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \ 
    113142    -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\client" -I"$(PACKAGES_DIR)\d2m" \ 
    114     -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" 
     143    $(GDBM_INCLUDES) 
    115144LDFLAGS =  
    116 LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" \ 
     145LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" $(GDBM_LIBS) \ 
    117146        "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib" $(ACCENTFOLD_LIBS) \ 
    118147    $(SQLITE_LIBS)