X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2FMakefile;h=fb09a78400137645215f22ce3919e42beaf1f2ab;hp=6ac9eed6566be4f5fc94849217d1d5eb48260c02;hb=559aecba0e61eca34706023436692ba23faa29a7;hpb=b3be6bf5b31785568d39c3c1d631759df84d90ca

diff --git a/client/Makefile b/client/Makefile
index 6ac9eed..fb09a78 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,37 +1,29 @@
-# Copyright (C) 1994, Index Data I/S 
+# Copyright (C) 1995-1998, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.1 1995-05-22 11:30:30 quinn Exp $
+# $Id: Makefile,v 1.15 1998-02-11 11:53:33 adam Exp $
 
 LIBDIR=../lib
 
 #LIBMOSI=../../xtimosi/src/libmosi.a $(LIBDIR)/librfc.a
 
 SHELL=/bin/sh
-INCLUDE=-I../include -I. -I../../xtimosi/src -I../../alex/include
+INCLUDE=-I../include -I. -I../../xtimosi/src
 LIBINCLUDE=-L$(LIBDIR)
-#CFLAGS=-Wall -pedantic -g
-DEFS=$(INCLUDE) -DRPN_QUERY
-#LIB=$(LIBDIR)/libserver.a 
-LIBS=$(LIBDIR)/libserver.a $(LIBDIR)/libasn.a $(LIBDIR)/libodr.a \
-  $(LIBDIR)/libcomstack.a ../lib/ccl.a $(LIBMOSI) $(LIBDIR)/libutil.a
-#PO = 
+DEFS=$(INCLUDE) $(CDEFS) -DCCL2RPN=1
+LIBS=$(LIBDIR)/libasn.a $(LIBDIR)/libutil.a \
+  $(LIBDIR)/libcomstack.a ../lib/ccl.a $(LIBMOSI) $(LIBDIR)/libodr.a 
 CPP=$(CC) -E
 PROG=client
 PROGO=client.o
 
 all: $(PROG)
 
-$(PROG): $(LIB) $(PROGO) 
-	$(CC) $(CFLAGS) $(LIBINCLUDE) -o $(PROG) $(PROGO) $(LIBS)
+$(PROG): $(LIB) $(PROGO) $(LIBS)
+	$(CC) $(CFLAGS) $(LIBINCLUDE) -o $(PROG) $(PROGO) $(LIBS) $(ELIBS)
 
 alll:
 
-$(LIB): $(PO)
-	rm -f $(LIB)
-	ar qc $(LIB) $(PO)
-	ranlib $(LIB)
-
 $(LIBDIR):
 	mkdir $(LIBDIR)
 
@@ -42,15 +34,14 @@ clean:
 	rm -f *.[oa] test core mon.out gmon.out errlist tst cli $(PROG)
 
 depend: depend2
-:
+
 depend1:
-	mv Makefile Makefile.tmp
-	sed '/^#Depend/q' <Makefile.tmp >Makefile
-	$(CPP) $(INCLUDE) -M *.c >>Makefile
-	-rm Makefile.tmp
+	sed '/^#Depend/q' <Makefile >Makefile.tmp
+	$(CPP) $(DEFS) -M *.c >>Makefile.tmp
+	mv -f Makefile.tmp Makefile
 
 depend2:
-	$(CPP) $(INCLUDE) -M *.c >.depend	
+	$(CPP) $(DEFS) -M *.c >.depend	
 
 ifeq (.depend,$(wildcard .depend))
 include .depend