X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile.in;h=ec057e03ca2ea1fb3bcf2d2938f11ce6968b30be;hb=71b6a2c41c24d62fb4b195893b63fc7e1e158adb;hp=b14caa9027919b8c29688ae523bad3f2e0607db9;hpb=a8063bff74c6d48f7a0aec23c266894777e3134b;p=yazpp-moved-to-github.git

diff --git a/src/Makefile.in b/src/Makefile.in
index b14caa9..ec057e0 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 1999, Index Data ApS
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.3 1999-03-23 14:17:57 adam Exp $
+# $Id: Makefile.in,v 1.7 2000-09-08 10:23:42 adam Exp $
 
 SHELL=/bin/sh
 
@@ -13,22 +13,18 @@ RANLIB=@RANLIB@
 CDEFS=@DEFS@
 LIBS=@LIBS@
 
-LIBDIR=../../yaz/lib
-
-INCLUDE=-I../../yaz/z39.50 -I../../yaz/include -I../include
+YAZLIB=@YAZLIB@ 
+INCLUDE=-I../include @YAZINC@
 DEFS=$(INCLUDE) $(CDEFS)
-YAZLIBS=$(LIBDIR)/libasn.a \
-  $(LIBDIR)/libcomstack.a $(LIBDIR)/ccl.a \
-  $(LIBDIR)/libodr.a $(LIBDIR)/libutil.a 
-PROG1=yaz-client
+PROG1=yaz-clientx
 PROGO1=yaz-client.o
 PROG2=yaz-server
 PROGO2=yaz-server.o
 PROG3=yaz-proxy
 PROGO3=yaz-proxy-main.o
 LIB=libyaz++.lib
-PO=yaz-socket-manager.o yaz-pdu-assoc.o yaz-ir-assoc.o yaz-proxy.o \
-	yaz-z-query.o
+PO=yaz-socket-manager.o yaz-pdu-assoc.o yaz-z-assoc.o yaz-proxy.o \
+	yaz-z-query.o yaz-ir-assoc.o yaz-z-server.o
 
 .SUFFIXES: .cpp
 
@@ -39,14 +35,14 @@ $(LIB): $(PO)
 	ar qc $(LIB) $(PO)
 	$(RANLIB) $(LIB)
 
-$(PROG1): $(PROGO1) $(YAZLIBS) $(LIB)
-	$(CXX) $(CXXFLAGS) -o $(PROG1) $(PROGO1) $(LIB) $(YAZLIBS) $(LIBS) 
+$(PROG1): $(PROGO1) $(LIB)
+	$(CXX) $(CXXFLAGS) -o $(PROG1) $(PROGO1) $(LIB) $(YAZLIB) $(LIBS) 
 
-$(PROG2): $(PROGO2) $(YAZLIBS) $(LIB)
-	$(CXX) $(CXXFLAGS) -o $(PROG2) $(PROGO2) $(LIB) $(YAZLIBS) $(LIBS) 
+$(PROG2): $(PROGO2) $(LIB)
+	$(CXX) $(CXXFLAGS) -o $(PROG2) $(PROGO2) $(LIB) $(YAZLIB) $(LIBS) 
 
-$(PROG3): $(PROGO3) $(YAZLIBS) $(LIB)
-	$(CXX) $(CXXFLAGS) -o $(PROG3) $(PROGO3) $(LIB) $(YAZLIBS) $(LIBS) 
+$(PROG3): $(PROGO3) $(LIB)
+	$(CXX) $(CXXFLAGS) -o $(PROG3) $(PROGO3) $(LIB) $(YAZLIB) $(LIBS) 
 
 alll: