Changeset 1323

Timestamp:

2000-08-02T12:54:16+12:00 (24 years ago)

Author:

kjm18

Message:

mgpp incorporated. have mgsearch and mgppsearch, mgqueryfilter and mgppqueryfilter.
mg and mgpp stuff are incompatible to make at same time.
'make' will make everything with mg, 'make USE_MGPP=1' will make everything
with mgpp. Both should be run.

File:

• trunk/gsdl/src/colservr/Makefile.in (modified) (3 diffs)

trunk/gsdl/src/colservr/Makefile.in

@@ -32 +32 @@
 
 USE_FASTCGI = @USE_FASTCGI@
+USE_MGPP = @USE_MGPP@
 ifneq ($(USE_FASTCGI), 1)
 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER @DEFS@
 
-INCLUDES = -I../.. -I../../lib -I../recpt -I../../packages/mg \
-       -I../../packages/mg/lib -I../../packages/mg/src/text
+CGI_INCLUDES = 
+
 else
 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER -DUSE_FASTCGI @DEFS@
 
-INCLUDES = -I../.. -I../../lib -I../recpt -I../../packages/mg \
-       -I../../packages/mg/lib -I../../packages/mg/src/text \
-           -I../../packages/fcgi/include
+CGI_INCLUDES = -I../../packages/fcgi/include 
 endif
+
+ifneq ($(USE_MGPP), 1)
+MG_INCLUDES = -I../../packages/mg  -I../../packages/mg/lib \
+        -I../../packages/mg/src/text
+MG_HEADERS = mgq.h mgsearch.h mgqueryfilter.h 
+
+MG_SOURCES = mgq.c mgsearch.cpp mgqueryfilter.cpp 
+
+MG_OBJECTS = mgq.o mgsearch.o mgqueryfilter.o 
+
+else
+MG_INCLUDES = -I../mgpp/text -I../mgpp/lib 
+
+MG_HEADERS = mgppsearch.h mgppqueryfilter.h
+
+MG_SOURCES = mgppsearch.cpp mgppqueryfilter.cpp
+
+MG_OBJECTS = mgppsearch.o mgppqueryfilter.o
+
+endif
+
+INCLUDES = -I../.. -I../../lib -I ../recpt \
+        $(CGI_INCLUDES) $(MG_INCLUDES)
 
 RANLIB = @RANLIB@
@@ -64 +86 @@
     $(COMPILE) $< 
 
-HEADERS = mgq.h mgsearch.h querycache.h queryinfo.h collectserver.h \
+HEADERS = search.h  querycache.h queryinfo.h collectserver.h \
           colservrconfig.h maptools.h filter.h source.h browsefilter.h \
-          queryfilter.h mggdbmsource.h phrasesearch.h phrasequeryfilter.h
+          queryfilter.h mggdbmsource.h phrasesearch.h phrasequeryfilter.h \
+      $(MG_HEADERS)
 
-SOURCES = mgq.c mgsearch.cpp querycache.cpp queryinfo.cpp collectserver.cpp \
+SOURCES = search.cpp querycache.cpp queryinfo.cpp collectserver.cpp \
           colservrconfig.cpp maptools.cpp filter.cpp source.cpp \
           browsefilter.cpp queryfilter.cpp mggdbmsource.cpp phrasesearch.cpp \
-          phrasequeryfilter.cpp
+          phrasequeryfilter.cpp \
+      $(MG_SOURCES)
 
-OBJECTS = mgq.o mgsearch.o querycache.o queryinfo.o collectserver.o \
+OBJECTS = search.o querycache.o queryinfo.o collectserver.o \
           colservrconfig.o maptools.o filter.o source.o browsefilter.o \
-          queryfilter.o mggdbmsource.o phrasesearch.o phrasequeryfilter.o
+          queryfilter.o mggdbmsource.o phrasesearch.o phrasequeryfilter.o \
+      $(MG_OBJECTS)
 
 all : $(OBJECTS)
@@ -89 +114 @@
 depend:
     makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES)
+
+
+
+