Fixed Makefile(s).

[yaz-moved-to-github.git] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index e4c37d2..d1edd80 100644 (file)
--- 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.4 1995-05-30 10:16:03 quinn Exp $
+# $Id: Makefile,v 1.14 1998-01-07 12:59:27 adam Exp $
 
 LIBDIR=../lib
 
@@ -10,8 +10,7 @@ LIBDIR=../lib
 SHELL=/bin/sh
 INCLUDE=-I../include -I. -I../../xtimosi/src
 LIBINCLUDE=-L$(LIBDIR)
-#CFLAGS=-Wall -pedantic -g
-DEFS=$(INCLUDE) -DRPN_QUERY -DPREFIX_QUERY
+DEFS=$(INCLUDE) $(CDEFS) -DCCL2RPN=1
 LIBS=$(LIBDIR)/libasn.a $(LIBDIR)/libodr.a \
   $(LIBDIR)/libcomstack.a ../lib/ccl.a $(LIBMOSI) $(LIBDIR)/libutil.a
 CPP=$(CC) -E
@@ -20,8 +19,8 @@ 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:
 
@@ -37,13 +36,12 @@ clean:
 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