X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=dict%2FMakefile;h=71a6de85649f661b88039a886babf90ffd502da8;hb=d4b2d9a55eff084aa7db77d1aa98e032f4c7659e;hp=c81758c68049fd84bed39f218031ae745ec93969;hpb=e9b13c0966913e073e98f9c5d7c5f4deed7c4c46;p=idzebra-moved-to-github.git

diff --git a/dict/Makefile b/dict/Makefile
index c81758c..71a6de8 100644
--- a/dict/Makefile
+++ b/dict/Makefile
@@ -1,34 +1,37 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.12 1994-10-03 17:23:01 adam Exp $
+# $Id: Makefile,v 1.17 1995-10-30 14:10:52 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 
+#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 \
+PO = scan.o dopen.o dclose.o drdwr.o open.o close.o insert.o lookup.o \
  lookupec.o lookgrep.o
-CPP=cc -E
+CPP=$(CC) -E
 
 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