X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2FMakefile;h=22af8c9041c09f248f1ecefc6870bbfcfca62835;hb=3e97ca3e99068d83691ad6d43d53dd9f1f316889;hp=aa1a93b8bf79dba75b5926e4afecf8280a685e10;hpb=11034430cbb2df1afce15b6cac2bd01f6f8e0fbe;p=idzebra-moved-to-github.git

diff --git a/dict/Makefile b/dict/Makefile
index aa1a93b..22af8c9 100644
--- a/dict/Makefile
+++ b/dict/Makefile
@@ -1,33 +1,39 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.14 1995-02-06 10:13:17 adam Exp $
+# $Id: Makefile,v 1.21 1996-03-20 09:35:15 adam Exp $
 
 SHELL=/bin/sh
-INCLUDE=-I../include
+RANLIB=ranlib
+
+YAZLIB=../../yaz/lib/libyaz.a
+YAZINC=-I../../yaz/include
+
+INCLUDE=-I../include $(YAZINC)
 TPROG1=dicttest
 TPROG2=dictext
-CFLAGS=-g -Wall -pedantic -ansi
+#CFLAGS=-g -Wall -pedantic -ansi
 DEFS=$(INCLUDE)
 LIB=../lib/dict.a 
-PO = dopen.o dclose.o drdwr.o open.o close.o insert.o lookup.o \
- lookupec.o lookgrep.o
-CPP=cc -E
+PO = scan.o dopen.o dclose.o drdwr.o open.o close.o insert.o lookup.o \
+ lookupec.o lookgrep.o delete.o
+CPP=$(CC) -E
 
 all: $(LIB)
 
 alll: $(LIB) $(TPROG1) $(TPROG2)
 
-$(TPROG1): $(TPROG1).o $(LIB) ../lib/bfile.a ../lib/util.a ../lib/dfa.a
-	$(CC) $(CFLAGS) -o $(TPROG1) $(TPROG1).o $(LIB) ../lib/bfile.a ../lib/dfa.a ../lib/util.a 
+$(TPROG1): $(TPROG1).o $(LIB) ../lib/bfile.a ../lib/alexutil.a ../lib/dfa.a
+	$(CC) $(CFLAGS) -o $(TPROG1) $(TPROG1).o $(LIB) \
+		../lib/bfile.a ../lib/dfa.a ../lib/alexutil.a $(YAZLIB)
 
-$(TPROG2): $(TPROG2).o $(LIB) ../lib/util.a
-	$(CC) $(CFLAGS) -o $(TPROG2) $(TPROG2).o ../lib/util.a
+$(TPROG2): $(TPROG2).o $(LIB) ../lib/alexutil.a
+	$(CC) $(CFLAGS) -o $(TPROG2) $(TPROG2).o ../lib/alexutil.a $(YAZLIB)
 
 $(LIB): $(PO)
 	rm -f $(LIB)
 	ar qc $(LIB) $(PO)
-	ranlib $(LIB)
+	$(RANLIB) $(LIB)
 
 .c.o:
 	$(CC) -c $(DEFS) $(CFLAGS) $<
@@ -38,13 +44,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