Changeset 22766 for main/trunk/greenstone2/runtime-src/src

Timestamp:

2010-08-24T16:58:15+12:00 (14 years ago)

Author:

mdewsnip

Message:

Instead of having two copies of expat in Greenstone (one for Linux and one for Windows), added Windows makefiles into the version in common-src/packages/expat. This means we can remove the Windows-only version in common-src/packages/windows/expat, and also means that expat now works the same as SQLite.

Location:

main/trunk/greenstone2/runtime-src/src

Files:

• colservr/win32.mak (modified) (1 diff)
• oaiservr/win32.mak (modified) (1 diff)
• recpt/win32.mak (modified) (1 diff)
• w32server/win32.mak (modified) (1 diff)
• z3950/win32.mak (modified) (1 diff)

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

@@ -146 +146 @@
     $(MG_INCLUDES) \
     $(MGPP_INCLUDES) \
-    -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" $(GDBM_INCLUDES) $(SQLITE_INCLUDES)
+    -I"$(COMMON_PACKAGES_DIR)\expat\include" $(GDBM_INCLUDES) $(SQLITE_INCLUDES)
 
 !IF $(GSDL_VC4)

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

@@ -143 +143 @@
         $(MGPP_INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" \
     $(GDBM_INCLUDES) \
-    -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat"
+    -I"$(COMMON_PACKAGES_DIR)\expat\include"
 LDFLAGS = 
-LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
+LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" \
         $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
 

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

@@ -162 +162 @@
 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
     $(MG_INCLUDES) $(MGPP_INCLUDES) \
-    -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" \
+    -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" -I"$(COMMON_PACKAGES_DIR)\expat\include" \
     $(GDBM_INCLUDES) \
     $(Z3950_INCLUDES)
 LDFLAGS = 
-LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
+LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" \
        $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)
 

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

@@ -139 +139 @@
         $(MGPP_INCLUDES)
 
-LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
+LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" \
         $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
 RSC = rc

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

@@ -143 +143 @@
     $(GDBM_INCLUDES)
 LDFLAGS = 
-LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" $(GDBM_LIBS) \
+LIBS = "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" $(GDBM_LIBS) \
         "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib" $(ACCENTFOLD_LIBS) \
     $(SQLITE_LIBS)