X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2FMakefile;h=ee9f629a98f19f1f5e7ad3f3142f66eae2c336fb;hb=74fea1da1e215be90a2ffd92443048bf3c684cba;hp=6c1e62ad5c4d407d3de0b9be6e7da5518515ead4;hpb=d8a3c1b4e3c628b65d6812348003c55d20056871;p=idzebra-moved-to-github.git

diff --git a/dict/Makefile b/dict/Makefile
index 6c1e62a..ee9f629 100644
--- a/dict/Makefile
+++ b/dict/Makefile
@@ -1,13 +1,16 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.13 1995-01-24 16:01:02 adam Exp $
+# $Id: Makefile,v 1.15 1995-09-04 12:33:31 adam Exp $
 
 SHELL=/bin/sh
-INCLUDE=-I../include
+RANLIB=ranlib
+YAZ=../../yaz
+YAZLIB=$(YAZ)/lib/libyaz.a
+INCLUDE=-I../include -I$(YAZ)/include
 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 \
@@ -18,17 +21,17 @@ all: $(LIB)
 
 alll: $(LIB) $(TPROG1) $(TPROG2)
 
-$(TPROG1): $(TPROG1).o $(LIB) 
-	$(CC) $(CFLAGS) -o $(TPROG1) $(TPROG1).o $(LIB) ../lib/bfile.a ../lib/dfa.a ../lib/util.a 
-
-$(TPROG2): $(TPROG2).o $(LIB) 
-	$(CC) $(CFLAGS) -o $(TPROG2) $(TPROG2).o ../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/alexutil.a $(YAZLIB)
+	$(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) $<
@@ -39,13 +42,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