X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile.in;h=8e18d443d61db022f8d614552b010844c119238b;hb=acd0ff2a7f87fb33a82475dcc7aa44cd7189d4c0;hp=da2c0afcd5a68545b503d85380242517366a2779;hpb=bf377ba45c8c1cbcf843fdecc6d5c68fda6bad18;p=yazpp-moved-to-github.git

diff --git a/src/Makefile.in b/src/Makefile.in
index da2c0af..8e18d44 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Copyright (C) 1999, Index Data 
+# Copyright (C) 1999, Index Data ApS
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1999-01-28 09:41:07 adam Exp $
+# $Id: Makefile.in,v 1.6 1999-12-06 13:52:45 adam Exp $
 
 SHELL=/bin/sh
 
@@ -13,23 +13,20 @@ 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=$(LIBDIR)/yazchan.lib
-PO=yaz-socket-manager.o yaz-pdu-assoc.o yaz-ir-assoc.o yaz-proxy.o
+LIB=libyaz++.lib
+PO=yaz-socket-manager.o yaz-pdu-assoc.o yaz-z-assoc.o yaz-proxy.o \
+	yaz-z-query.o yaz-ir-assoc.o
 
-.SUFFIXES: .cc
+.SUFFIXES: .cpp
 
 all: $(PROG1) $(PROG2) $(PROG3)
 
@@ -38,18 +35,18 @@ $(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:
 
-.cc.o:
+.cpp.o:
 	$(CXX) -c $(DEFS) $(CXXFLAGS) $<
 
 .c.o:
@@ -57,11 +54,11 @@ alll:
 
 clean:
 	rm -f *.[oa] test core mon.out gmon.out errlist
-	rm -f $(PROG1) $(PROG2) $(PROG3)
+	rm -f $(PROG1) $(PROG2) $(PROG3) $(LIB)
 
 depend:
 	sed '/^#Depend/q' <Makefile >Makefile.tmp
-	$(CXXCPP) $(DEFS) -M *.cc >>Makefile.tmp
+	$(CXXCPP) $(DEFS) -M *.cpp >>Makefile.tmp
 	mv -f Makefile.tmp Makefile
 
 #Depend --- DOT NOT DELETE THIS LINE