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

diff --git a/dict/Makefile b/dict/Makefile
index ece4b6b..22af8c9 100644
--- a/dict/Makefile
+++ b/dict/Makefile
@@ -1,21 +1,23 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.16 1995-10-06 09:04:03 adam Exp $
+# $Id: Makefile,v 1.21 1996-03-20 09:35:15 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=dicttest
 TPROG2=dictext
 #CFLAGS=-g -Wall -pedantic -ansi
 DEFS=$(INCLUDE)
 LIB=../lib/dict.a 
 PO = scan.o dopen.o dclose.o drdwr.o open.o close.o insert.o lookup.o \
- lookupec.o lookgrep.o
-CPP=cc -E
+ lookupec.o lookgrep.o delete.o
+CPP=$(CC) -E
 
 all: $(LIB)
 
@@ -25,7 +27,7 @@ $(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)
+$(TPROG2): $(TPROG2).o $(LIB) ../lib/alexutil.a
 	$(CC) $(CFLAGS) -o $(TPROG2) $(TPROG2).o ../lib/alexutil.a $(YAZLIB)
 
 $(LIB): $(PO)