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

diff --git a/dfa/Makefile b/dfa/Makefile
index a83a74b..84ee8cc 100644
--- a/dfa/Makefile
+++ b/dfa/Makefile
@@ -1,64 +1,59 @@
-# 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.7 1995-02-06 10:12:55 adam Exp $
+# $Id: Makefile,v 1.15 1996-10-29 13:57:17 adam Exp $
 
 SHELL=/bin/sh
-INCLUDE=-I../include
+RANLIB=ranlib
+
+YAZLIB=../../yaz/lib/libyaz.a
+YAZINC=-I../../yaz/include
+
+INCLUDE=-I../include $(YAZINC)
 TPROG1=agrep
 TPROG2=lexer
 TPROG3=grepper
-CFLAGS=-g -Wall -pedantic -ansi
-DEFS=$(INCLUDE) -DYACC -DYYDEBUG=1 -DMEMDEBUG=1
+DEFS=$(INCLUDE)
 LIB=../lib/dfa.a 
 PO = dfa.o imalloc.o states.o set.o bset.o
-CPP=cc -E
-YACC=yacc
+CPP=$(CC) -E
 
 all: $(LIB)
 
 alll: $(LIB) $(TPROG1) $(TPROG2) $(TPROG3)
 
-$(TPROG1): $(TPROG1).o $(LIB) ../lib/util.a
-	$(CC) $(CFLAGS) -o $(TPROG1) $(TPROG1).o $(LIB) ../lib/util.a
+$(TPROG1): $(TPROG1).o $(LIB) ../lib/zebrautl.a 
+	$(CC) $(CFLAGS) -o $(TPROG1) $(TPROG1).o $(LIB) \
+		../lib/zebrautl.a $(YAZLIB)
 
-$(TPROG2): $(TPROG2).o readfile.o $(LIB) ../lib/util.a
-	$(CC) $(CFLAGS) -o $(TPROG2) $(TPROG2).o readfile.o $(LIB) ../lib/util.a
+$(TPROG2): $(TPROG2).o readfile.o $(LIB) ../lib/zebrautl.a
+	$(CC) $(CFLAGS) -o $(TPROG2) $(TPROG2).o readfile.o $(LIB) \
+		../lib/zebrautl.a $(YAZLIB)
 
-$(TPROG3): $(TPROG3).o $(LIB) 
-	$(CC) $(CFLAGS) -o $(TPROG3) $(TPROG3).o $(LIB) ../lib/util.a
+$(TPROG3): $(TPROG3).o $(LIB) ../lib/zebrautl.a
+	$(CC) $(CFLAGS) -o $(TPROG3) $(TPROG3).o $(LIB) $(YAZLIB) \
+		../lib/zebrautl.a $(YAZLIB)
 
 $(LIB): $(PO)
 	rm -f $(LIB)
 	ar qc $(LIB) $(PO)
-	ranlib $(LIB)
+	$(RANLIB) $(LIB)
 
 .c.o:
 	$(CC) -c $(DEFS) $(CFLAGS) $<
 
-.y.o:
-	$(YACC) $(YFLAGS) $<
-	$(CC) -c $(DEFS) $(CFLAGS) y.tab.c
-	mv y.tab.o $*.o
-
 clean:
-	rm -f *.[oa] $(TPROG1) $(TPROG2) $(TPROG3) core mon.out gmon.out errlist y.tab*
+	rm -f *.[oa] $(TPROG1) $(TPROG2) $(TPROG3) core mon.out gmon.out errlist
 
 depend: depend2
 
 depend1:
-	mv Makefile Makefile.tmp
-	$(YACC) $(YFLAGS) regexp.y
-	mv y.tab.c regexp.c
-	sed '/^#Depend/q' <Makefile.tmp >Makefile
-	$(CPP) -M $(DEFS) *.c |sed 's/regexp\.c/regexp.y/g' >>Makefile
-	rm -f Makefile.tmp regexp.c
+	sed '/^#Depend/q' <Makefile >Makefile.tmp
+	$(CPP) $(DEFS) -M *.c >>Makefile.tmp
+	mv -f Makefile.tmp Makefile
 
 depend2:
-	$(YACC) $(YFLAGS) regexp.y
-	mv y.tab.c regexp.c
-	$(CPP) -M $(DEFS) *.c |sed 's/regexp\.c/regexp.y/g' >.depend
-	rm -f regexp.c
+	$(CPP) $(DEFS) -M *.c >.depend
 
 ifeq (.depend,$(wildcard .depend))
 include .depend