Changeset 15519 for gsdl/trunk/src/colservr

Timestamp:

2008-05-16T10:17:52+12:00 (16 years ago)

Author:

mdewsnip

Message:

Big tidy up of win32.mak file.

File:

• gsdl/trunk/src/colservr/win32.mak (modified) (4 diffs)

gsdl/trunk/src/colservr/win32.mak

@@ -29 +29 @@
 DLL = 0
 DLLDEBUG = 0
-USE_Z3950=0
 STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
 
-AR = lib
-CC = cl
 
 !IF $(GSDL_VC4)
@@ -49 +46 @@
 !ENDIF
 
-LDFLAGS =
+
+AR = lib
+CC = cl
 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" \
@@ -63 +62 @@
 !ENDIF
 
-LIBS =
 
 COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
-LINK = $(CC) -nologo $(LDFLAGS)
+
 
 .SUFFIXES:
@@ -77 +75 @@
     $(COMPILE) $< 
 
-!IF $(USE_Z3950)
-INCLUDES = $(INCLUDES) -I"$(GSDLHOME)\packages\yaz\yaz-2.1.4\include" -I"$(GSDLHOME)\packages\d2m"
-Z3950HEADERS = 
-Z3950SOURCES = z3950parser.cpp z3950explain.cpp z3950_to_gsdl.cpp z3950server.cpp
-Z3950OBJECTS = z3950parser.obj z3950explain.obj z3950_to_gsdl.obj z3950server.obj
-Z3950LIB = gsdlz3950.lib
-!ELSE
-Z3950HEADERS = 
-Z3950SOURCES = 
-Z3950OBJECTS = 
-Z3950LIB =
-!ENDIF
 
-HEADERS = comtypes.h mgq.h search.h mgsearch.h querycache.h queryinfo.h collectserver.h \
-          colservrconfig.h maptools.h filter.h source.h browsefilter.h \
-          queryfilter.h mgqueryfilter.h mggdbmsource.h phrasesearch.h \
-          phrasequeryfilter.h collectset.h mgppsearch.h mgppqueryfilter.h \
-          lucenegdbmsource.h lucenequeryfilter.h lucenesearch.h \
-          expat_resultset.h expat_document.h gdbmsource.h
+SOURCES = \
+        browsefilter.cpp \
+    collectserver.cpp \
+    collectset.cpp \
+        colservrconfig.cpp \
+    comtypes.cpp \
+    expat_document.cpp \
+    expat_resultset.cpp \
+    filter.cpp \
+    gdbmsource.cpp \
+    lucenegdbmsource.cpp \
+    lucenequeryfilter.cpp \
+    lucenesearch.cpp \
+    maptools.cpp \
+    mggdbmsource.cpp \
+    mgq.c \
+    mgqueryfilter.cpp \
+    mgsearch.cpp \
+    mgppqueryfilter.cpp \
+    mgppsearch.cpp \
+    phrasequeryfilter.cpp \
+    phrasesearch.cpp \
+    querycache.cpp \
+    queryfilter.cpp \
+    queryinfo.cpp \
+    search.cpp \
+    source.cpp
 
-SOURCES = comtypes.cpp mgq.c search.cpp mgsearch.cpp querycache.cpp queryinfo.cpp \
-      collectserver.cpp colservrconfig.cpp maptools.cpp filter.cpp \
-      source.cpp browsefilter.cpp queryfilter.cpp mgqueryfilter.cpp \
-      mggdbmsource.cpp phrasesearch.cpp phrasequeryfilter.cpp \
-          collectset.cpp mgppsearch.cpp mgppqueryfilter.cpp \
-          lucenegdbmsource.cpp lucenequeryfilter.cpp lucenesearch.cpp \
-          expat_resultset.cpp expat_document.cpp gdbmsource.cpp
-
-OBJECTS = comtypes.obj mgq.obj search.obj mgsearch.obj querycache.obj queryinfo.obj \
-      collectserver.obj colservrconfig.obj maptools.obj filter.obj \
-      source.obj browsefilter.obj queryfilter.obj mgqueryfilter.obj \
-      mggdbmsource.obj phrasesearch.obj phrasequeryfilter.obj \
-          collectset.obj mgppsearch.obj mgppqueryfilter.obj \
-          lucenegdbmsource.obj lucenequeryfilter.obj lucenesearch.obj \
-          expat_resultset.obj expat_document.obj gdbmsource.obj 
+OBJECTS = \
+        browsefilter.obj \
+    collectserver.obj \
+    collectset.obj \
+        colservrconfig.obj \
+    comtypes.obj \
+    expat_document.obj \
+    expat_resultset.obj \
+    filter.obj \
+    gdbmsource.obj \
+    lucenegdbmsource.obj \
+    lucenequeryfilter.obj \
+    lucenesearch.obj \
+    maptools.obj \
+    mggdbmsource.obj \
+    mgq.obj \
+    mgqueryfilter.obj \
+    mgsearch.obj \
+    mgppqueryfilter.obj \
+    mgppsearch.obj \
+    phrasequeryfilter.obj \
+    phrasesearch.obj \
+    querycache.obj \
+    queryfilter.obj \
+    queryinfo.obj \
+    search.obj \
+    source.obj
     
 
-all : gsdlcolservr.lib $(Z3950LIB)
+all: gsdlcolservr.lib
 
-gsdlcolservr.lib : $(OBJECTS) 
+gsdlcolservr.lib: $(OBJECTS) 
     if EXIST gsdlcolservr.lib del gsdlcolservr.lib
     $(AR) -nologo /out:gsdlcolservr.lib $(OBJECTS)
 
-gsdlz3950.lib : $(Z3950OBJECTS)
-    if EXIST gsdlz3950.lib del gsdlz3950.lib
-    $(AR) -nologo /out:gsdlz3950.lib $(Z3950OBJECTS)
 clean:
     del *.obj
     del gsdlcolservr.lib
-    del gsdlz3950.lib
 
 install: