Changeset 8309

Timestamp:

2004-10-13T14:30:33+13:00 (20 years ago)

Author:

mdewsnip

Message:

Changed the makefile to use the gsdlcolservr library instead of all the colservr files. This makes a big difference for Microsoft Visual C++ 4, since the linking command would be too long otherwise.

File:

• trunk/gsdl/src/oaiservr/win32.mak (modified) (2 diffs)

trunk/gsdl/src/oaiservr/win32.mak

@@ -110 +110 @@
 
 OBJECTS = $(COMMONOBJECTS) $(OAIOBJECTS)
-COLSERVROBJECTS = "$(colservrDir)\mgq.obj" \
-          "$(colservrDir)\search.obj" \
-                  "$(colservrDir)\mgsearch.obj" \
-                  "$(colservrDir)\querycache.obj" \
-                  "$(colservrDir)\queryinfo.obj" \
-                  "$(colservrDir)\collectserver.obj" \
-                  "$(colservrDir)\colservrconfig.obj" \
-                  "$(colservrDir)\maptools.obj" \
-                  "$(colservrDir)\filter.obj" \
-                  "$(colservrDir)\source.obj" \
-                  "$(colservrDir)\browsefilter.obj" \
-                  "$(colservrDir)\queryfilter.obj" \
-                  "$(colservrDir)\mggdbmsource.obj" \
-                  "$(colservrDir)\phrasesearch.obj" \
-                  "$(colservrDir)\phrasequeryfilter.obj" \
-          "$(colservrDir)\mgqueryfilter.obj" \
-          "$(colservrDir)\mgppsearch.obj" \
-          "$(colservrDir)\mgppqueryfilter.obj" \
-          "$(colservrDir)\collectset.obj"
 
-OAI_OBJS = $(COMMONOBJECTS) $(OAIOBJECTS) $(COLSERVROBJECTS) \
-    "$(GSDLHOME)\lib\gsdllib.lib"  \
-    "$(GSDLHOME)\packages\mg\src\text\libtextin.lib" \
-    "$(GSDLHOME)\packages\mg\lib\libmg.lib" \
-    "$(srcDir)\mgpp\text\libtextin.lib" \
-    "$(srcDir)\mgpp\lib\libmg.lib"
+OAI_OBJS = $(COMMONOBJECTS) $(OAIOBJECTS) $(LIBS)
 
 EXEC = oaimain.exe
@@ -148 +124 @@
 
 oaimain.exe: $(OAI_OBJS)
-         $(LINK) $(OAI_OBJS) $(LIBS) 
-
+         $(LINK) $(OAI_OBJS)