X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dfa%2FMakefile;h=84ee8cc09f9511f3a5bc8b38534026d02f903a5d;hb=5f8ba9f35bd3c9aeafe26613021f2edd141b8611;hp=6f14f02cde8c4b38672ed9c4ac1d766afe2114e2;hpb=cf67c63195045b4ba4d535d8df5129732aab215d;p=idzebra-moved-to-github.git

diff --git a/dfa/Makefile b/dfa/Makefile
index 6f14f02..84ee8cc 100644
--- a/dfa/Makefile
+++ b/dfa/Makefile
@@ -1,36 +1,38 @@
-# Copyright (C) 1994, Index Data I/S 
+# Copyright (C) 1994-1996, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.10 1995-09-28 09:18:50 adam Exp $
+# $Id: Makefile,v 1.15 1996-10-29 13:57:17 adam Exp $
 
 SHELL=/bin/sh
 RANLIB=ranlib
-YAZ=../../yaz
-YAZLIB=$(YAZ)/lib/libyaz.a
-INCLUDE=-I../include -I$(YAZ)/include
+
+YAZLIB=../../yaz/lib/libyaz.a
+YAZINC=-I../../yaz/include
+
+INCLUDE=-I../include $(YAZINC)
 TPROG1=agrep
 TPROG2=lexer
 TPROG3=grepper
-DEFS=$(INCLUDE) -DMEMDEBUG=1
+DEFS=$(INCLUDE)
 LIB=../lib/dfa.a 
 PO = dfa.o imalloc.o states.o set.o bset.o
-CPP=cc -E
+CPP=$(CC) -E
 
 all: $(LIB)
 
 alll: $(LIB) $(TPROG1) $(TPROG2) $(TPROG3)
 
-$(TPROG1): $(TPROG1).o $(LIB) ../lib/alexutil.a $(YAZLIB)
+$(TPROG1): $(TPROG1).o $(LIB) ../lib/zebrautl.a 
 	$(CC) $(CFLAGS) -o $(TPROG1) $(TPROG1).o $(LIB) \
-		../lib/alexutil.a $(YAZLIB)
+		../lib/zebrautl.a $(YAZLIB)
 
-$(TPROG2): $(TPROG2).o readfile.o $(LIB) ../lib/alexutil.a $(YAZLIB)
+$(TPROG2): $(TPROG2).o readfile.o $(LIB) ../lib/zebrautl.a
 	$(CC) $(CFLAGS) -o $(TPROG2) $(TPROG2).o readfile.o $(LIB) \
-		../lib/alexutil.a $(YAZLIB)
+		../lib/zebrautl.a $(YAZLIB)
 
-$(TPROG3): $(TPROG3).o $(LIB) ../lib/alexutil.a $(YAZLIB)
+$(TPROG3): $(TPROG3).o $(LIB) ../lib/zebrautl.a
 	$(CC) $(CFLAGS) -o $(TPROG3) $(TPROG3).o $(LIB) $(YAZLIB) \
-		../lib/alexutil.a $(YAZLIB)
+		../lib/zebrautl.a $(YAZLIB)
 
 $(LIB): $(PO)
 	rm -f $(LIB)
@@ -47,11 +49,11 @@ depend: depend2
 
 depend1:
 	sed '/^#Depend/q' <Makefile >Makefile.tmp
-	$(CPP) -M $(DEFS) *.c >>Makefile.tmp
+	$(CPP) $(DEFS) -M *.c >>Makefile.tmp
 	mv -f Makefile.tmp Makefile
 
 depend2:
-	$(CPP) -M $(DEFS) *.c >.depend
+	$(CPP) $(DEFS) -M *.c >.depend
 
 ifeq (.depend,$(wildcard .depend))
 include .depend