Changeset 8031

Timestamp:

2004-08-24T10:03:15+12:00 (20 years ago)

Author:

davidb

Message:

Support for compiling lucene and z39.50 options in.

File:

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

trunk/gsdl/src/colservr/Makefile.in

@@ -67 +67 @@
 endif
 
+USE_LUCENE=0
+ifeq ($(USE_LUCENE), 1)
+LC_INCLUDES = -I../../packages/xerces/include
+LC_HEADERS  = lucenesearch.h   lucenequeryfilter.h   lucenegdbmsource.h \
+          sax_resultset.h   sax_resultset_handler.h 
+
+LC_SOURCES  = lucenesearch.cpp lucenequeryfilter.cpp lucenegdbmsource.cpp \
+          sax_resultset.cpp sax_resultset_handler.cpp
+
+LC_OBJECTS  = lucenesearch.o   lucenequeryfilter.o   lucenegdbmsource.o \
+          sax_resultset.o   sax_resultset_handler.o
+else
+LC_INCLUDES =
+LC_SOURCES  =
+LC_OBJECTS  =
+endif
+
 INCLUDES = -I. -I../.. -I../../lib -I../recpt \
-        $(CGI_INCLUDES) $(MG_INCLUDES) @GDBM_INCLUDE@
+        $(CGI_INCLUDES) $(MG_INCLUDES) $(LC_INCLUDES) @GDBM_INCLUDE@
 MICO_DIR = @MICO_DIR@
 ifeq ($(MICO_DIR), default)
@@ -85 +102 @@
 
 USE_CORBA = @USE_CORBA@
+USE_Z3950 = @USE_Z3950@
 
 RANLIB = @RANLIB@
@@ -128 +146 @@
 endif
 
+ifeq ($(USE_Z3950), 1)
+INCLUDES += -I../../packages/yaz2/include
+Z3950HEADERS = 
+Z3950SOURCES = z3950server.cpp read-grs.cpp
+Z3950OBJECTS = z3950server.o read-grs.o
+else
+Z3950HEADERS = 
+Z3950SOURCES = 
+Z3950OBJECTS = 
+endif
+
 # following objects need both mg and mgpp stuff - jrm21
 MG_MGPP_OBJECTS=collectset.o
@@ -134 +163 @@
           colservrconfig.h maptools.h filter.h source.h browsefilter.h \
           queryfilter.h mggdbmsource.h phrasesearch.h phrasequeryfilter.h \
-      $(MG_HEADERS) $(CORBAHEADERS)
+      $(MG_HEADERS) $(LC_HEADERS) $(CORBAHEADERS)
 
 SOURCES = search.cpp querycache.cpp queryinfo.cpp collectserver.cpp \
@@ -140 +169 @@
           browsefilter.cpp queryfilter.cpp mggdbmsource.cpp phrasesearch.cpp \
           phrasequeryfilter.cpp collectset.cpp \
-      $(MG_SOURCES) $(CORBASOURCES)
+      $(MG_SOURCES) $(LC_SOURCES) $(CORBASOURCES)
 
 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 \
-      $(MG_MGPP_OBJECTS) $(MG_OBJECTS) $(CORBAOBJECTS)
+      $(MG_MGPP_OBJECTS) $(MG_OBJECTS) $(LC_OBJECTS) $(CORBAOBJECTS) 
 
 all : $(OBJECTS)
-    $(MAKE) USE_MGPP=1 $(MGPP_OBJECTS)
+    $(MAKE) USE_MGPP=1 $(MGPP_OBJECTS) $(Z3950OBJECTS)
 
 distclean: