X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2FMakefile;h=fb09a78400137645215f22ce3919e42beaf1f2ab;hp=14a5c6e56301fcee978c9b499ba88baaefde0e23;hb=8de81d57ebf189d37a160fe66df667b50ba7cb86;hpb=abda0ffc1ac8fca34535f39c6581ed16e70e15f9

diff --git a/client/Makefile b/client/Makefile
index 14a5c6e..fb09a78 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,7 +1,7 @@
-# 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.11 1996-10-07 15:29:01 quinn Exp $
+# $Id: Makefile,v 1.15 1998-02-11 11:53:33 adam Exp $
 
 LIBDIR=../lib
 
@@ -10,20 +10,17 @@ LIBDIR=../lib
 SHELL=/bin/sh
 INCLUDE=-I../include -I. -I../../xtimosi/src
 LIBINCLUDE=-L$(LIBDIR)
-DEFS=$(INCLUDE) -DCCL2RPN=1
-LIBS=$(LIBDIR)/libasn.a $(LIBDIR)/libodr.a \
-  $(LIBDIR)/libcomstack.a ../lib/ccl.a $(LIBMOSI) $(LIBDIR)/libutil.a $(ELIBS)
+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)
-
-qparser: qparser.o
-	$(CC) $(CFLAGS) $(LIBINCLUDE) -o qparser qparser.o $(LIBS)
+$(PROG): $(LIB) $(PROGO) $(LIBS)
+	$(CC) $(CFLAGS) $(LIBINCLUDE) -o $(PROG) $(PROGO) $(LIBS) $(ELIBS)
 
 alll:
 
@@ -44,7 +41,7 @@ depend1:
 	mv -f Makefile.tmp Makefile
 
 depend2:
-	$(CPP) $(INCLUDE) -M *.c >.depend	
+	$(CPP) $(DEFS) -M *.c >.depend	
 
 ifeq (.depend,$(wildcard .depend))
 include .depend