Changeset 13773 for trunk/gsdl/src/colservr

Timestamp:

2007-01-24T10:44:49+13:00 (17 years ago)

Author:

kjdon

Message:

mg, mgpp, unac. lucenewrap moved from gsdl into separate indexers repository so they can be easily shared with gs3.

Location:

trunk/gsdl/src/colservr

Files:

• Makefile.in (modified) (5 diffs)
• win32.mak (modified) (1 diff)

trunk/gsdl/src/colservr/Makefile.in

@@ -34 +34 @@
 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER @DEFS@
 
+INDEXERS_DIR=../../indexers
 USE_FASTCGI = @USE_FASTCGI@
 USE_MGPP = @USE_MGPP@
@@ -47 +48 @@
 
 ifneq ($(USE_MGPP), 1)
-MG_INCLUDES = -I../../packages/mg  -I../../packages/mg/lib \
-        -I../../packages/mg/src/text
+MG_INCLUDES = -I$(INDEXERS_DIR)/mg  -I$(INDEXERS_DIR)/mg/lib \
+        -I$(INDEXERS_DIR)/mg/src/text
 MG_HEADERS = mgq.h mgsearch.h mgqueryfilter.h 
 
@@ -57 +58 @@
 
 else
-MG_INCLUDES = -I../mgpp/text -I../mgpp/lib 
+MG_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text -I$(INDEXERS_DIR)/mgpp/lib 
 
 MG_HEADERS = mgppsearch.h mgppqueryfilter.h
@@ -92 +93 @@
 endif
 endif
-MINCLUDES = -I. -I../../lib -I../recpt  -I../mgpp/text $(MICO_INC)
+MINCLUDES = -I. -I../../lib -I../recpt  -I$(INDEXERS_DIR)/mgpp/text $(MICO_INC)
 
 USE_CORBA = @USE_CORBA@
@@ -185 +186 @@
 # needs IndexData.h from mgpp...
 $(MG_MGPP_OBJECTS): %.o : %.cpp
-    $(CXXCOMPILE) -I../mgpp/text -I../mgpp/lib -o $@ $<
+    $(CXXCOMPILE) -I$(INDEXERS_DIR)/mgpp/text -I$(INDEXERS_DIR)/mgpp/lib -o $@ $<
 
 depend:

trunk/gsdl/src/colservr/win32.mak

@@ -52 +52 @@
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -DXML_STATIC -D_CRT_SECURE_NO_DEPRECATE
 INCLUDES = -I"$(GSDLHOME)" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\src\colservr" \
-       -I"$(GSDLHOME)\src\recpt" -I"$(GSDLHOME)\packages\mg" \
-       -I"$(GSDLHOME)\packages\mg\lib" -I"$(GSDLHOME)\packages\mg\src\text" \
+       -I"$(GSDLHOME)\src\recpt" -I"$(GSDLHOME)\indexers\mg" \
+       -I"$(GSDLHOME)\indexers\mg\lib" -I"$(GSDLHOME)\indexers\mg\src\text" \
        -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" \
-           -I"$(GSDLHOME)\src\mgpp\lib" -I"$(GSDLHOME)\src\mgpp\text" \
+           -I"$(GSDLHOME)\indexers\mgpp\lib" -I"$(GSDLHOME)\indexers\mgpp\text" \
            -I"$(GSDLHOME)\packages\windows\expat\expat"