Changeset 22926


Ignore:
Timestamp:
2010-09-20T10:56:44+12:00 (12 years ago)
Author:
davidb
Message:

Additional syntax added to optionally allow mod_gsdl.so to be compile using the built-in apache that ships with Greenstone

File:
1 edited

Legend:

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

    r22766 r22926  
    4040LOCAL_LIBRARY = 0
    4141USE_Z3950 = 0
     42USE_GSDL_MOD = 0
    4243DEBUG = 0
    4344DLL = 0
     
    122123!ENDIF
    123124
     125!IF $(USE_GSDL_MOD)
     126APACHE_OBJS = string_pool.obj mod_gsdl.obj
     127
     128APACHE_INSTDIR=$(GSDL_DIR)\apache-httpd\windows
     129APACHE_SRCLIBDIR=..\..\packages\apache-httpd\httpd-2.2.11\srclib
     130
     131APXS_CFLAGS=-I$(APACHE_INSTDIR)\include \
     132  -I$(APACHE_SRCLIBDIR)\apr\include -I$(APACHE_SRCLIBDIR)\apr-util\include
     133
     134APXS_LINKFLAGS= /libpath:$(APACHE_INSTDIR)\lib \
     135  /libpath:$(APACHE_SRCLIBDIR)\apr\include \
     136  /libpath:$(APACHE_SRCLIBDIR)\apr-util\include
     137
     138APXS_LDFLAGS= -L$(APACHE_INSTDIR)\lib \
     139  -L$(APACHE_SRCLIBDIR)\apr\include \
     140  -L$(APACHE_SRCLIBDIR)\apr-util\include
     141
     142APXS_LIBS = libaprutil-1.lib libapr-1.lib libhttpd.lib
     143
     144APACHE_MODULE = mod_gsdl.so
     145!ELSE
     146APACHE_OBJS =
     147APACHE_MODULE =
     148!ENDIF
     149
     150
    124151!IF $(ENABLE_MG)
    125152MG_DEFS = -DENABLE_MG
     
    165192    $(GDBM_INCLUDES) \
    166193    $(Z3950_INCLUDES)
    167 LDFLAGS =
     194LDFLAGS = -Z7 /errorReport:prompt
    168195LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" \
    169196       $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)
     
    310337# Default target: make gsdlrecpt.lib if LOCAL_LIBRARY is set, otherwise both gsdlrecpt.lib and library.exe
    311338!IF $(LOCAL_LIBRARY)
    312 all: $(LIBRARY)
    313 !ELSE
    314 all: $(LIBRARY) $(EXECUTABLE)
     339all: $(LIBRARY) $(APACHE_MODULE)
     340!ELSE
     341all: $(LIBRARY) $(EXECUTABLE) $(APACHE_MODULE)
    315342!ENDIF
    316343
     
    321348library.cgi: $(EXECUTABLE_OBJECTS)
    322349    $(LINK) $(EXECUTABLE_OBJECTS) $(LIBS)
     350
     351
     352mod_gsdl.obj: mod_gsdl.cpp
     353    $(CC) -nologo /MD /W3 /D WIN32 /D _WINDOWS /D NDEBUG -c  $(CXXFLAGS) $(DEFS) $(INCLUDES) -D_APACHE_MOD=2 $(APXS_CFLAGS) mod_gsdl.cpp
     354##  cl.exe /nologo /MT /W3 /O2 /D WIN32 /D _WINDOWS /D NDEBUG -I"C:\Program Files\xampp\apache\include" -c mod_gsdl.c
     355
     356mod_gsdl.so: $(APACHE_OBJS) $(LIBRARY)
     357    $(CC) /nologo -Fe"mod_gsdl.dll"  $(APACHE_OBJS) gsdlrecpt.lib $(GSDL_LIBS) $(LIBS) $(APXS_LDFLAGS) $(APXS_LIBS)
     358
     359#   link /nologo /dll  $(APACHE_OBJS) gsdlrecpt.lib $(GSDL_LIBS) $(LIBS) $(APXS_LDFLAGS) $(APXS_LIBS)
     360    rename mod_gsdl.dll mod_gsdl.so
     361
     362##  $(CC) -nologo /dll -Fe"$@" $(APACHE_OBJS) $(LIBRARY) $(GSDL_LIBS) $(LIBS)
     363
     364
     365## link.exe  kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"C:\Program Files\xampp\apache\lib" libaprutil-1.lib libapr-1.lib libhttpd.lib mod_gsdl.obj
     366
     367##  rename mod_gsdl.dll mod_gsdl.so
     368
     369
     370# COMPILE = $(CC) -nologo -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
     371# LINK = $(CC) -nologo -Fe"$@" $(LDFLAGS)
     372
     373
     374
     375
     376
    323377
    324378osprocess-test.cgi: $(OSPROCESS_OBJECTS) os_process_test.obj
Note: See TracChangeset for help on using the changeset viewer.