Changeset 10439

Timestamp:

2005-08-08T16:14:56+12:00 (19 years ago)

Author:

kjdon

Message:

added z3950 support for windows

File:

• trunk/gsdl/src/recpt/win32.mak (modified) (6 diffs)

trunk/gsdl/src/recpt/win32.mak

@@ -28 +28 @@
 USE_STLPORT = 0
 LOCAL_LIBRARY = 0
+USE_Z3950 = 0
 DLL = 0
 DLLDEBUG = 0
 STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
 
+# YAZ kit for z39.50
+YAZDIR=$(GSDLHOME)\packages\yaz\yaz-2.1.4
+
 AR = lib
 CC = cl
@@ -44 +48 @@
 !ENDIF
 
-LDFLAGS =
+LDFLAGS = 
+
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX
 INCLUDES = -I"$(GSDLHOME)\src\recpt" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\src\colservr" \
@@ -69 +74 @@
        "$(GSDLHOME)\packages\windows\expat\libexpat.lib"
 
+!IF $(USE_Z3950)
+DEFS = $(DEFS) -DUSE_Z3950
+Z3950EXEC = z3950server.exe
+Z3950OBJS = z3950proto.obj z3950proxy.obj  yaz_zclient.obj zparse.tab.obj parse.yy.obj 
+Z_CLIENTOBJS = "$(YAZDIR)\win\obj\tabcomplete.obj"
+Z_LIBYAZ = "$(YAZDIR)\lib\yaz.lib"
+LDFLAGS = $(LDFLAGS) /link /NOD:msvcrt.lib
+!ELSE
+Z3950EXEC = 
+Z3950OBJS =
+Z_CLIENTOBJS =
+Z_LIBYAZ =
+!ENDIF
 
 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
-LINK = $(CC) $(LDFLAGS) -o $@
+LINK = $(CC) -o $@ 
 
 .SUFFIXES:
@@ -126 +144 @@
         historydb.obj phindbrowserclass.obj collectoraction.obj nullproto.obj \
         argdb.obj browseaction.obj browseactiontools.obj phindaction.obj \
-        summarise.obj highlighttext.obj configaction.obj
+        summarise.obj highlighttext.obj configaction.obj $(Z3950OBJS) 
 
 CGIOBJECTS = librarymain.obj cgiwrapper.obj
 
+
 OBJECTS = $(COMMONOBJECTS) $(CGIOBJECTS)
 
-EXEC = library.exe
+EXEC = library.exe $(Z3950EXEC)
 
 !IF $(LOCAL_LIBRARY)
-all: gsdlrecpt.lib
+all: gsdlrecpt.lib $(Z3950EXEC)
 !ELSE
 all: $(EXEC)
 !ENDIF
 
-gsdlrecpt.lib : $(COMMONOBJECTS)
+gsdlrecpt.lib : $(COMMONOBJECTS) $(Z_CLIENTOBJS)
     if EXIST gsdlrecpt.lib del gsdlrecpt.lib
-    $(AR) /out:gsdlrecpt.lib $(COMMONOBJECTS)
+    $(AR) /out:gsdlrecpt.lib $(COMMONOBJECTS) $(Z_CLIENTOBJS)
 
 clean:
     del *.obj
     del library.exe
-
+    del z3950server.exe
 !IF $(LOCAL_LIBRARY)
 install:
@@ -154 +173 @@
     copy library.exe "$(GSDLHOME)\cgi-bin"
 !ENDIF
-
-library.exe: $(OBJECTS)
-         $(LINK) $(OBJECTS) $(LIBS) 
+!IF $(USE_Z3950)
+    copy z3950server.exe "$(GSDLHOME)\cgi-bin"
+!ENDIF
+
+
+yaz_zclient.obj: yaz_zclient.c
+    $(COMPILE) -I"$(YAZDIR)\include" -I"$(YAZDIR)\client" yaz_zclient.c
+
+library.exe: $(OBJECTS) $(Z_CLIENTOBJS)
+         $(LINK) $(OBJECTS) $(LIBS) $(Z_LIBYAZ) $(Z_CLIENTOBJS) $(LDFLAGS)
+
+Z3950_OBJS_OLD = $(COMMONOBJECTS) $(COLSERVROBJECTS)\
+    ../colservr/z3950parser.o ../colservr/z3950explain.o \
+    ../colservr/z3950_to_gsdl.o \
+    ../colservr/z3950server.o ../colservr/read-grs.o nullproto.o \
+    ../../lib/gsdllib.a  \
+    ../../packages/mg/src/text/libtextin.a \
+    ../../packages/mg/lib/libmg.a \
+    $(FASTCGI_OBJS) \
+    ../mgpp/text/libtextin.a \
+    ../mgpp/lib/libmg.a ../../packages/yaz/lib/libyaz.a ../../packages/d2m/libd2m.a
+
+Z3950_OBJS =  "$(GSDLHOME)\src\colservr\gsdlz3950.lib" \
+    "$(YAZDIR)\lib\yaz.lib" \
+    "$(GSDLHOME)\packages\d2m\libd2m.lib" \
+    parse.yy.obj comtypes.obj infodbclass.obj \
+    OIDtools.obj recptconfig.obj recptproto.obj \
+    nullproto.obj
+ 
+z3950server.exe: $(Z3950_OBJS)
+    @echo building z3950server
+    $(LINK) $(Z3950_OBJS) $(LIBS) $(LDFLAGS)
 
 # we want the following to always be compiled in case the status of
@@ -164 +212 @@
 
 FORCE:
+