Changeset 22078 for main/trunk/greenstone2/runtime-src/src
- Timestamp:
- 2010-05-12T20:33:31+12:00 (14 years ago)
- Location:
- main/trunk/greenstone2/runtime-src/src
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/runtime-src/src/oaiservr/Makefile.in
r22058 r22078 65 65 ifeq ($(USE_GDBM), 1) 66 66 GDBM_DEFINES = -DUSE_GDBM 67 GDBM_LIBS = $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 67 68 else 68 69 GDBM_DEFINES = 70 GDBM_LIBS = 69 71 endif 70 72 … … 93 95 INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) $(MGPP_INCLUDES) 94 96 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 95 LIBS = @LIBS@ $( COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a-L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \97 LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \ 96 98 $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 97 99 INSTALL = @INSTALL@ -
main/trunk/greenstone2/runtime-src/src/oaiservr/win32.mak
r21945 r22078 43 43 DLLDEBUG = 0 44 44 ENABLE_ACCENTFOLD = 1 45 USE_GDBM = 1 46 USE_JDBM = 1 45 47 USE_SQLITE = 1 48 USE_MSSQL = 0 46 49 ENABLE_MG = 1 47 50 ENABLE_MGPP = 1 … … 74 77 !ENDIF 75 78 79 !IF $(USE_GDBM) 80 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \ 81 -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" 82 GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" 83 GDBM_DEFINES = -DUSE_GDBM 84 !ELSE 85 GDBM_INCLUDES = 86 GDBM_LIBS = 87 GDBM_DEFINES = 88 !ENDIF 89 90 !IF $(USE_JDBM) 91 JDBM_DEFINES = -DUSE_JDBM 92 !ELSE 93 JDBM_DEFINES = 94 !ENDIF 95 76 96 !IF $(USE_SQLITE) 77 97 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 98 SQLITE_DEFINES = -DUSE_SQLITE 78 99 !ELSE 79 100 SQLITE_LIBS = 101 SQLITE_DEFINES = 102 !ENDIF 103 104 !IF $(USE_MSSQL) 105 MSSQL_DEFINES = -DUSE_MSSQL 106 !ELSE 107 MSSQL_DEFINES = 80 108 !ENDIF 81 109 … … 110 138 CC = cl 111 139 DEFS = -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) 113 142 INCLUDES = -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \ 114 143 $(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) \ 116 145 -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" 117 146 LDFLAGS = 118 147 LIBS = "$(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) 120 149 121 150 !IF $(GSDL_VC4) -
main/trunk/greenstone2/runtime-src/src/protocol/Makefile.in
r22058 r22078 43 43 ifeq ($(USE_GDBM), 1) 44 44 GDBM_DEFINES = -DUSE_GDBM 45 GDBM_INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include 45 46 else 46 47 GDBM_DEFINES = 48 GDBM_INCLUDES = 47 49 endif 48 50 … … 67 69 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 68 70 # 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\71 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib $(GDBM_INCLUDES) \ 70 72 -I$(COLSERVR_DIR) $(MGPP_INCLUDES) 71 73 RANLIB = @RANLIB@ -
main/trunk/greenstone2/runtime-src/src/protocol/win32.mak
r21945 r22078 38 38 DLL = 0 39 39 DLLDEBUG = 0 40 USE_GDBM = 1 41 USE_JDBM = 1 42 USE_SQLITE = 1 43 USE_MSSQL = 0 40 44 ENABLE_MG = 1 41 45 ENABLE_MGPP = 1 … … 60 64 CXXFLAGS = $(CXXFLAGS) -MDd 61 65 !ENDIF 66 !ENDIF 67 68 !IF $(USE_GDBM) 69 GDBM_DEFINES = -DUSE_GDBM 70 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm 71 !ELSE 72 GDBM_DEFINES = 73 GDBM_INCLUDES = 74 !ENDIF 75 76 !IF $(USE_JDBM) 77 JDBM_DEFINES = -DUSE_JDBM 78 !ELSE 79 JDBM_DEFINES = 80 !ENDIF 81 82 !IF $(USE_SQLITE) 83 SQLITE_DEFINES = -DUSE_SQLITE 84 !ELSE 85 SQLITE_DEFINES = 86 !ENDIF 87 88 !IF $(USE_MSSQL) 89 MSSQL_DEFINES = -DUSE_MSSQL 90 !ELSE 91 MSSQL_DEFINES = 62 92 !ENDIF 63 93 … … 85 115 CC = cl 86 116 DEFS = -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) \ 87 118 $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 88 119 # Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! 89 120 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" $(MGPP_INCLUDES) \ 90 -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm"121 $(GDBM_INCLUDES) 91 122 92 123 !IF $(GSDL_VC4) -
main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in
r22058 r22078 85 85 GDBM_DEFINES = -DUSE_GDBM 86 86 GDBM_INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include 87 GDBM_LIBS = $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 87 88 else 88 89 GDBM_DEFINES = 89 90 GDBM_INCLUDES = 91 GDBM_LIBS = 90 92 endif 91 93 … … 155 157 INSTALL = @INSTALL@ 156 158 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 157 LIBS = @LIBS@ $( COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a\159 LIBS = @LIBS@ $(GDBM_LIBS) \ 158 160 $(COMMON_PACKAGES_DIR)/expat/lib/libexpat.a \ 159 161 $(ACCENTFOLD_LIBS) $(FASTCGI_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS) -
main/trunk/greenstone2/runtime-src/src/recpt/win32.mak
r22066 r22078 45 45 ENABLE_ACCENTFOLD = 1 46 46 USE_GDBM = 1 47 USE_JDBM = 1 47 48 USE_SQLITE = 1 49 USE_MSSQL = 0 48 50 ENABLE_MG = 1 49 51 ENABLE_MGPP = 1 … … 78 80 !IF $(USE_GDBM) 79 81 GDBM_DEFINES = -DUSE_GDBM 82 GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" 80 83 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" 81 84 !ELSE 82 85 GDBM_DEFINES = 86 GDBM_LIBS = 83 87 GDBM_INCLUDES = 88 !ENDIF 89 90 !IF $(USE_JDBM) 91 JDBM_DEFINES = -DUSE_JDBM 92 !ELSE 93 JDBM_DEFINES = 84 94 !ENDIF 85 95 … … 94 104 SQL_OBJECTS = 95 105 SQLITE_LIBS = 106 !ENDIF 107 108 !IF $(USE_MSSQL) 109 MSSQL_DEFINES = -DUSE_MSSQL 110 !ELSE 111 MSSQL_DEFINES = 96 112 !ENDIF 97 113 … … 142 158 CC = cl 143 159 DEFS = -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) 145 162 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ 146 163 $(MG_INCLUDES) $(MGPP_INCLUDES) \ … … 150 167 LDFLAGS = 151 168 LIBS = "$(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) 153 170 154 171 !IF $(GSDL_VC4) -
main/trunk/greenstone2/runtime-src/src/w32server/win32.mak
r21945 r22078 40 40 DEBUG = 0 41 41 ENABLE_ACCENTFOLD = 1 42 USE_GDBM = 1 43 USE_JDBM = 1 42 44 USE_SQLITE = 1 45 USE_MSSQL = 0 43 46 ENABLE_MG = 1 44 47 ENABLE_MGPP = 1 … … 66 69 !ENDIF 67 70 71 !IF $(USE_GDBM) 72 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \ 73 -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" 74 GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" 75 GDBM_DEFINES = -DUSE_GDBM 76 !ELSE 77 GDBM_INCLUDES = 78 GDBM_LIBS = 79 GDBM_DEFINES = 80 !ENDIF 81 82 !IF $(USE_JDBM) 83 JDBM_DEFINES = -DUSE_JDBM 84 !ELSE 85 JDBM_DEFINES = 86 !ENDIF 87 68 88 !IF $(USE_SQLITE) 69 89 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 90 SQLITE_DEFINES = -DUSE_SQLITE 70 91 !ELSE 71 92 SQLITE_LIBS = 93 SQLITE_DEFINES = 94 !ENDIF 95 96 !IF $(USE_MSSQL) 97 MSSQL_DEFINES = -DUSE_MSSQL 98 !ELSE 99 MSSQL_DEFINES = 72 100 !ENDIF 73 101 … … 103 131 CC = cl 104 132 DEFS = -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) \ 105 134 $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 106 135 INCLUDES = -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) \ 108 137 -I"$(COLSERVR_DIR)" \ 109 138 $(MG_INCLUDES) \ … … 111 140 112 141 LIBS = "$(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) 114 143 RSC = rc 115 144 WINLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib \ -
main/trunk/greenstone2/runtime-src/src/z3950/Makefile.in
r22058 r22078 64 64 USE_GDBM = @USE_GDBM@ 65 65 ifeq ($(USE_GDBM), 1) 66 GDBM_LIBS = $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 66 67 GDBM_DEFINES = -DUSE_GDBM 67 68 else 69 GDBM_LIBS = 68 70 GDBM_DEFINES = 69 71 endif … … 92 94 CFLAGS = @CFLAGS@ 93 95 CPPFLAGS = @CXXFLAGS@ 94 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 96 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 95 97 GSDLOS = @gsdlos@ 96 98 # Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! … … 100 102 INSTALL = @INSTALL@ 101 103 LDFLAGS = @LDFLAGS@ 102 LIBS = @LIBS@ $( COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a-L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \104 LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \ 103 105 $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) \ 104 106 $(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 41 41 DLLDEBUG = 0 42 42 ENABLE_ACCENTFOLD = 1 43 USE_GDBM = 1 44 USE_JDBM = 1 43 45 USE_SQLITE = 1 46 USE_MSSQL = 0 44 47 ENABLE_MG = 1 45 48 ENABLE_MGPP = 1 … … 72 75 !ENDIF 73 76 77 !IF $(USE_GDBM) 78 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \ 79 -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" 80 GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" 81 GDBM_DEFINES = -DUSE_GDBM 82 !ELSE 83 GDBM_INCLUDES = 84 GDBM_LIBS = 85 GDBM_DEFINES = 86 !ENDIF 87 88 !IF $(USE_JDBM) 89 JDBM_DEFINES = -DUSE_JDBM 90 !ELSE 91 JDBM_DEFINES = 92 !ENDIF 93 74 94 !IF $(USE_SQLITE) 75 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 95 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib 96 SQLITE_DEFINES = -DUSE_SQLITE 76 97 !ELSE 77 98 SQLITE_LIBS = 99 SQLITE_DEFINES = 100 !ENDIF 101 102 !IF $(USE_MSSQL) 103 MSSQL_DEFINES = -DUSE_MSSQL 104 !ELSE 105 MSSQL_DEFINES = 78 106 !ENDIF 79 107 … … 107 135 CC = cl 108 136 DEFS = -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) \ 109 138 $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 110 139 # Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! … … 112 141 $(MGPP_INCLUDES) -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \ 113 142 -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) 115 144 LDFLAGS = 116 LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib"\145 LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" $(GDBM_LIBS) \ 117 146 "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib" $(ACCENTFOLD_LIBS) \ 118 147 $(SQLITE_LIBS)
Note:
See TracChangeset
for help on using the changeset viewer.