Changeset 22080 for main/trunk/greenstone2/runtime-src/src/z3950

Timestamp:

2010-05-12T20:43:56+12:00 (14 years ago)

Author:

ak19

Message:

Undoing partial commit: accidentally committed windows makefiles along with the Linux makefiles which were the only ones I wanted to commit. Undoing commit because the changes are untested and only some changed files were committed.

File:

• main/trunk/greenstone2/runtime-src/src/z3950/win32.mak (modified) (4 diffs)

main/trunk/greenstone2/runtime-src/src/z3950/win32.mak

@@ -41 +41 @@
 DLLDEBUG = 0
 ENABLE_ACCENTFOLD = 1
-USE_GDBM = 1
-USE_JDBM = 1
 USE_SQLITE = 1
-USE_MSSQL = 0
 ENABLE_MG = 1
 ENABLE_MGPP = 1
@@ -75 +72 @@
 !ENDIF
 
-!IF $(USE_GDBM)
-GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \
-    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"
-GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib"
-GDBM_DEFINES = -DUSE_GDBM
-!ELSE
-GDBM_INCLUDES = 
-GDBM_LIBS = 
-GDBM_DEFINES =
-!ENDIF
-
-!IF $(USE_JDBM)
-JDBM_DEFINES = -DUSE_JDBM
-!ELSE
-JDBM_DEFINES =
-!ENDIF
-
 !IF $(USE_SQLITE)
-SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib
-SQLITE_DEFINES = -DUSE_SQLITE
+SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
 !ELSE
 SQLITE_LIBS = 
-SQLITE_DEFINES =
-!ENDIF
-
-!IF $(USE_MSSQL)
-MSSQL_DEFINES = -DUSE_MSSQL
-!ELSE
-MSSQL_DEFINES =
 !ENDIF
 
@@ -135 +107 @@
 CC = cl
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
-    $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \
     $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS)
 # Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist!
@@ -141 +112 @@
     $(MGPP_INCLUDES) -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \
     -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\client" -I"$(PACKAGES_DIR)\d2m" \
-    $(GDBM_INCLUDES)
+    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"
 LDFLAGS = 
-LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" $(GDBM_LIBS) \
+LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" \
         "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib" $(ACCENTFOLD_LIBS) \
     $(SQLITE_LIBS)