X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2FMakefile;h=75c6ea3830e1b8230410cc4275ba9ed53ca6e194;hb=9e83ba1ba78f4922d8e6f5434a263e2d339ea4b5;hp=dcbb131ad74a8d9fe58dafbbcca009cdcfc053bd;hpb=a1099d28cc3966419e7e90989510fdc2ba53643b;p=yaz-moved-to-github.git

diff --git a/client/Makefile b/client/Makefile
index dcbb131..75c6ea3 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,36 +1,31 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.2 1995-05-22 14:00:02 quinn Exp $
+# $Id: Makefile,v 1.13 1997-09-22 12:33:41 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 
+DEFS=$(INCLUDE) $(CDEFS) -DCCL2RPN=1
 LIBS=$(LIBDIR)/libasn.a $(LIBDIR)/libodr.a \
-  $(LIBDIR)/libcomstack.a ../lib/ccl.a $(LIBMOSI) $(LIBDIR)/libutil.a
-#PO = 
+  $(LIBDIR)/libcomstack.a ../lib/ccl.a $(LIBMOSI) $(LIBDIR)/libutil.a $(ELIBS)
 CPP=$(CC) -E
 PROG=client
 PROGO=client.o
 
 all: $(PROG)
 
-$(PROG): $(LIB) $(PROGO) 
+$(PROG): $(LIB) $(PROGO) $(LIBS)
 	$(CC) $(CFLAGS) $(LIBINCLUDE) -o $(PROG) $(PROGO) $(LIBS)
 
-alll:
+qparser: qparser.o
+	$(CC) $(CFLAGS) $(LIBINCLUDE) -o qparser qparser.o $(LIBS)
 
-$(LIB): $(PO)
-	rm -f $(LIB)
-	ar qc $(LIB) $(PO)
-	ranlib $(LIB)
+alll:
 
 $(LIBDIR):
 	mkdir $(LIBDIR)
@@ -42,15 +37,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