Show
Ignore:
Timestamp:
24.08.2010 16:58:15 (9 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:
5 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/src/colservr/win32.mak

    r22062 r22766  
    146146    $(MG_INCLUDES) \ 
    147147    $(MGPP_INCLUDES) \ 
    148     -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" $(GDBM_INCLUDES) $(SQLITE_INCLUDES) 
     148    -I"$(COMMON_PACKAGES_DIR)\expat\include" $(GDBM_INCLUDES) $(SQLITE_INCLUDES) 
    149149 
    150150!IF $(GSDL_VC4) 
  • main/trunk/greenstone2/runtime-src/src/oaiservr/win32.mak

    r22090 r22766  
    143143        $(MGPP_INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" \ 
    144144    $(GDBM_INCLUDES) \ 
    145     -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" 
     145    -I"$(COMMON_PACKAGES_DIR)\expat\include" 
    146146LDFLAGS =  
    147 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 
     147LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" \ 
    148148        $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 
    149149 
  • main/trunk/greenstone2/runtime-src/src/recpt/win32.mak

    r22188 r22766  
    162162INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ 
    163163    $(MG_INCLUDES) $(MGPP_INCLUDES) \ 
    164     -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" \ 
     164    -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" -I"$(COMMON_PACKAGES_DIR)\expat\include" \ 
    165165    $(GDBM_INCLUDES) \ 
    166166    $(Z3950_INCLUDES) 
    167167LDFLAGS =  
    168 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 
     168LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" \ 
    169169       $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS) 
    170170 
  • main/trunk/greenstone2/runtime-src/src/w32server/win32.mak

    r22090 r22766  
    139139        $(MGPP_INCLUDES) 
    140140 
    141 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 
     141LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" \ 
    142142        $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 
    143143RSC = rc 
  • main/trunk/greenstone2/runtime-src/src/z3950/win32.mak

    r22090 r22766  
    143143    $(GDBM_INCLUDES) 
    144144LDFLAGS =  
    145 LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" $(GDBM_LIBS) \ 
     145LIBS = "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" $(GDBM_LIBS) \ 
    146146        "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib" $(ACCENTFOLD_LIBS) \ 
    147147    $(SQLITE_LIBS)