Changeset 10178

Timestamp:

2005-06-27T15:33:04+12:00 (19 years ago)

Author:

kjdon

Message:

some modifications for using yaz 2 instead of yaz 1.6 with z3950 stuff

File:

• trunk/gsdl/src/recpt/Makefile.in (modified) (6 diffs)

trunk/gsdl/src/recpt/Makefile.in

@@ -120 +120 @@
 endif
 
+ifeq ($(USE_Z3950), 1)
+EXEC = $(EXEC) z3950server
+endif
+
 all: $(EXEC)
 
@@ -178 +182 @@
 
 ifeq ($(USE_Z3950), 1)
-Z_LIBSOURCES=z3950proto.cpp z3950proxy.cpp zparse.tab.c parse.yy.c $(YAZDIR)/client/yaz_zclient.c
+Z_LIBSOURCES=z3950proto.cpp z3950proxy.cpp yaz_zclient.c zparse.tab.c parse.yy.c $(YAZDIR)/yaz-2.1.4/client/tabcomplete.c
 else
 Z_LIBSOURCES=
@@ -211 +215 @@
 
 ifeq ($(USE_Z3950), 1)
-Z_LIBOBJS=z3950proto.o z3950proxy.o zparse.tab.o $(YAZDIR)/client/yaz_zclient.o
+Z_LIBOBJS=z3950proto.o z3950proxy.o yaz_zclient.o zparse.tab.o 
+Z_CLIENTOBJS=$(YAZDIR)/yaz-2.1.4/client/tabcomplete.o 
 else
 Z_LIBOBJS=
+Z_CLIENTOBJS=
 endif
 
@@ -248 +254 @@
 # Note! If USE_FASTCGI=1, yaz is still compiled and linked, but never
 # called by librarymain.cpp.
-$(YAZDIR)/client/yaz_zclient.o: $(YAZDIR)/lib/libyaz.a
-    cd $(YAZDIR)/client &&  $(MAKE) yaz_zclient.o
+yaz_zclient.o: yaz_zclient.c
+    $(COMPILE) -I$(YAZDIR)/include -I$(YAZDIR)/yaz-2.1.4/client $<
 
 # this should be done by the top level makefile...
 $(YAZDIR)/lib/libyaz.a:
-    cd $(YAZDIR) && $(MAKE) all
+    cd $(YAZDIR)/src && $(MAKE) && $(MAKE) install
 
 # put a separate rule here, as it speeds up compilation of other objects
@@ -312 +318 @@
 
 
-LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) \
+LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) $(Z_CLIENTOBJS) \
     ../../lib/gsdllib.a  \
     ../../packages/mg/src/text/libtextin.a \
@@ -379 +385 @@
     $(FASTCGI_OBJS) \
     ../mgpp/text/libtextin.a \
-    ../mgpp/lib/libmg.a ../../packages/yaz/lib/libyaz.a
+    ../mgpp/lib/libmg.a ../../packages/yaz/lib/libyaz.a ../../packages/d2m/libd2m.a
+
 
 z3950server: $(Z3950_OBJS)