# Copyright (C) 1994, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.15 1995-09-04 12:33:31 adam Exp $
+# $Id: Makefile,v 1.23 1996-10-29 14:00:00 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 = 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/alexutil.a ../lib/dfa.a
+$(TPROG1): $(TPROG1).o $(LIB) ../lib/bfile.a ../lib/zebrautl.a ../lib/dfa.a
$(CC) $(CFLAGS) -o $(TPROG1) $(TPROG1).o $(LIB) \
- ../lib/bfile.a ../lib/dfa.a ../lib/alexutil.a $(YAZLIB)
+ ../lib/bfile.a ../lib/dfa.a ../lib/zebrautl.a $(YAZLIB)
-$(TPROG2): $(TPROG2).o $(LIB) ../lib/alexutil.a $(YAZLIB)
- $(CC) $(CFLAGS) -o $(TPROG2) $(TPROG2).o ../lib/alexutil.a $(YAZLIB)
+$(TPROG2): $(TPROG2).o $(LIB) ../lib/zebrautl.a
+ $(CC) $(CFLAGS) -o $(TPROG2) $(TPROG2).o ../lib/zebrautl.a $(YAZLIB)
$(LIB): $(PO)
rm -f $(LIB)