Changeset 9129

Timestamp:

2005-02-22T11:40:59+13:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed up Windows makefiles so Expat is compiled into all the binaries for the Lucene stuff.

Location:

trunk/gsdl/src

Files:

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

trunk/gsdl/src/colservr/win32.mak

@@ -49 +49 @@
        -I"$(GSDLHOME)\packages\mg\lib" -I"$(GSDLHOME)\packages\mg\src\text" \
        -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" \
-       -I"$(GSDLHOME)\src\mgpp\lib" -I"$(GSDLHOME)\src\mgpp\text"
+           -I"$(GSDLHOME)\src\mgpp\lib" -I"$(GSDLHOME)\src\mgpp\text" \
+           -I"$(GSDLHOME)\packages\windows\expat"
 
 !IF $(USE_STLPORT)
@@ -73 +74 @@
           colservrconfig.h maptools.h filter.h source.h browsefilter.h \
           queryfilter.h mgqueryfilter.h mggdbmsource.h phrasesearch.h \
-      phrasequeryfilter.h collectset.h mgppsearch.h mgppqueryfilter.h
+          phrasequeryfilter.h collectset.h mgppsearch.h mgppqueryfilter.h \
+          lucenegdbmsource.h lucenequeryfilter.h lucenesearch.h \
+          expat_resultset.h
 
 SOURCES = mgq.c search.cpp mgsearch.cpp querycache.cpp queryinfo.cpp \
@@ -79 +82 @@
       source.cpp browsefilter.cpp queryfilter.cpp mgqueryfilter.cpp \
       mggdbmsource.cpp phrasesearch.cpp phrasequeryfilter.cpp \
-      collectset.cpp mgppsearch.cpp mgppqueryfilter.cpp
+          collectset.cpp mgppsearch.cpp mgppqueryfilter.cpp \
+          lucenegdbmsource.cpp lucenequeryfilter.cpp lucenesearch.cpp \
+          expat_resultset.cpp
 
 OBJECTS = mgq.obj search.obj mgsearch.obj querycache.obj queryinfo.obj \
@@ -85 +90 @@
       source.obj browsefilter.obj queryfilter.obj mgqueryfilter.obj \
       mggdbmsource.obj phrasesearch.obj phrasequeryfilter.obj \
-      collectset.obj mgppsearch.obj mgppqueryfilter.obj
+          collectset.obj mgppsearch.obj mgppqueryfilter.obj \
+          lucenegdbmsource.obj lucenequeryfilter.obj lucenesearch.obj \
+          expat_resultset.obj
 
 all : gsdlcolservr.lib

trunk/gsdl/src/oaiservr/win32.mak

@@ -66 +66 @@
        "$(GSDLHOME)\packages\mg\lib\libmg.lib" \
        "$(GSDLHOME)\src\mgpp\text\libtextin.lib" \
-       "$(GSDLHOME)\src\mgpp\lib\libmg.lib"
+       "$(GSDLHOME)\src\mgpp\lib\libmg.lib" \
+       "$(GSDLHOME)\packages\windows\expat\libexpat.lib"
 
 

trunk/gsdl/src/recpt/win32.mak

@@ -66 +66 @@
        "$(GSDLHOME)\packages\mg\lib\libmg.lib" \
        "$(GSDLHOME)\src\mgpp\text\libtextin.lib" \
-       "$(GSDLHOME)\src\mgpp\lib\libmg.lib"
+       "$(GSDLHOME)\src\mgpp\lib\libmg.lib" \
+       "$(GSDLHOME)\packages\windows\expat\libexpat.lib"
 
 

trunk/gsdl/src/w32server/win32.mak

@@ -53 +53 @@
        "$(GSDLHOME)\packages\windows\crypt\crypt\crypt.lib" \
        "$(GSDLHOME)\src\mgpp\lib\libmg.lib" \
-       "$(GSDLHOME)\src\mgpp\text\libtextin.lib"
+       "$(GSDLHOME)\src\mgpp\text\libtextin.lib" \
+       "$(GSDLHOME)\packages\windows\expat\libexpat.lib"
+
 
 WINLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib \