Changeset 15482 for gsdl/trunk/src/oaiservr/Makefile.in

Timestamp:

2008-05-15T13:29:02+12:00 (16 years ago)

Author:

mdewsnip

Message:

Changed to using gsdlcolservr.a and gsdlprotocol.a instead of specifying the files explicitly.

File:

• gsdl/trunk/src/oaiservr/Makefile.in (modified) (4 diffs)

gsdl/trunk/src/oaiservr/Makefile.in

@@ -47 +47 @@
 INSTALL = @INSTALL@
 
+
 CPPCOMPILE = $(CPP) -c $(CPPFLAGS) $(INCLUDES)
 CPPLINK = $(CPP) $(LDFLAGS) -o $@
@@ -56 +57 @@
     $(CPPCOMPILE) -o $@ $< 
 
-
-COLSERVR_OBJECTS = \
-    $(COLSERVR_DIR)/comtypes.o \
-    $(COLSERVR_DIR)/mgq.o \
-    $(COLSERVR_DIR)/search.o \
-        $(COLSERVR_DIR)/mgsearch.o \
-        $(COLSERVR_DIR)/querycache.o \
-        $(COLSERVR_DIR)/queryinfo.o \
-        $(COLSERVR_DIR)/collectserver.o \
-        $(COLSERVR_DIR)/colservrconfig.o \
-        $(COLSERVR_DIR)/maptools.o \
-        $(COLSERVR_DIR)/filter.o \
-        $(COLSERVR_DIR)/source.o \
-        $(COLSERVR_DIR)/browsefilter.o \
-        $(COLSERVR_DIR)/queryfilter.o \
-        $(COLSERVR_DIR)/gdbmsource.o \
-        $(COLSERVR_DIR)/mggdbmsource.o \
-        $(COLSERVR_DIR)/phrasesearch.o \
-        $(COLSERVR_DIR)/phrasequeryfilter.o \
-    $(COLSERVR_DIR)/mgqueryfilter.o \
-    $(COLSERVR_DIR)/mgppsearch.o \
-    $(COLSERVR_DIR)/mgppqueryfilter.o \
-    $(COLSERVR_DIR)/collectset.o \
-    $(COLSERVR_DIR)/lucenesearch.o \
-    $(COLSERVR_DIR)/lucenequeryfilter.o \
-    $(COLSERVR_DIR)/lucenegdbmsource.o \
-    $(COLSERVR_DIR)/expat_resultset.o \
-    $(COLSERVR_DIR)/expat_document.o
-
-PROTOCOL_OBJECTS = \
-    $(PROTOCOL_DIR)/nullproto.o \
-    $(PROTOCOL_DIR)/recptproto.o
 
 RECPT_OBJECTS = \
@@ -134 +103 @@
 
 GSDL_LIBS = \
-    $(GSDL_DIR)/lib/gsdllib.a  \
+    $(GSDL_DIR)/lib/gsdllib.a \
+    $(COLSERVR_DIR)/gsdlcolservr.a \
+    $(PROTOCOL_DIR)/gsdlprotocol.a \
     $(INDEXERS_DIR)/mg/src/text/libmgtext.a \
     $(INDEXERS_DIR)/mg/lib/libmglib.a \
@@ -140 +111 @@
     $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a
 
-EXEC_OBJECTS = \
+EXECUTABLE_OBJECTS = \
     $(OBJECTS) \
     $(RECPT_OBJECTS) \
-    $(PROTOCOL_OBJECTS) \
-    $(COLSERVR_OBJECTS) \
     $(GSDL_LIBS)
 
-EXEC = oaiserver
+EXECUTABLE = oaiserver
 
 
-oaiserver: $(EXEC_OBJECTS)
-    $(CPPLINK) $(EXEC_OBJECTS) $(LIBS)
+oaiserver: $(EXECUTABLE_OBJECTS)
+    $(CPPLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
 
-all: $(EXEC)
+all: $(EXECUTABLE)
 
-install: $(EXEC)
-    $(INSTALL) -m 755 -s $(EXEC) $(GSDL_DIR)/cgi-bin
+install: $(EXECUTABLE)
+    $(INSTALL) -m 755 -s $(EXECUTABLE) $(GSDL_DIR)/cgi-bin
 
 clean:
-    rm -f $(OBJECTS) $(EXEC)
+    rm -f $(OBJECTS) $(EXECUTABLE)
 
 distclean:
-    rm -f $(OBJECTS) $(EXEC) Makefile
+    rm -f $(OBJECTS) $(EXECUTABLE) Makefile
 
 depend: