Changeset 22078 for main/trunk/greenstone2/runtime-src/src/z3950
- Timestamp:
- 2010-05-12T20:33:31+12:00 (14 years ago)
- Location:
- main/trunk/greenstone2/runtime-src/src/z3950
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
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.