# Copyright (C) 1995, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.18 1995-11-16 17:00:55 adam Exp $
+# $Id: Makefile,v 1.21 1995-11-20 16:59:44 adam Exp $
SHELL=/bin/sh
RANLIB=ranlib
-YAZ=../../yaz
-YAZLIB=$(YAZ)/lib/libyaz.a
-OSILIB=../../xtimosi/src/libmosi.a $(YAZ)/lib/librfc.a
+
+YAZLIB=../../yaz/lib/libyaz.a
+YAZINC=-I../../yaz/include
+OSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a
#NETLIB=-lnsl -lsocket
-INCLUDE=-I../include -I$(YAZ)/include
+
+INCLUDE=-I../include $(YAZINC)
TPROG1=index
TPROG2=kdump
TPROG3=zserver
DEFS=$(INCLUDE)
-O1 = main.o dir.o trav.o extract.o kinput.o kcompare.o \
+O1 = main.o dir.o dirs.o trav.o extract.o kinput.o kcompare.o \
symtab.o text.o recctrl.o structrec.o recindex.o
O2 = kdump.o
O3 = zserver.o kcompare.o zrpn.o zsets.o text.o recctrl.o structrec.o \
all: $(TPROG1) $(TPROG2) $(TPROG3)
$(TPROG1): $(O1) ../lib/dict.a \
- ../lib/isam.a ../lib/bfile.a ../lib/alexutil.a \
- $(YAZLIB)
+ ../lib/isam.a ../lib/bfile.a ../lib/alexutil.a
$(CC) $(CFLAGS) -o $(TPROG1) $(O1) ../lib/dict.a \
../lib/isam.a ../lib/bfile.a ../lib/alexutil.a \
- $(YAZLIB) $(OSILIB)
+ $(YAZLIB)
-$(TPROG2): $(O2) $(YAZLIB)
+$(TPROG2): $(O2)
$(CC) $(CFLAGS) -o $(TPROG2) $(O2) $(YAZLIB)
$(TPROG3): $(O3) \
../lib/rset.a ../lib/dict.a ../lib/isam.a ../lib/bfile.a \
- ../lib/dfa.a ../lib/alexutil.a \
- $(YAZLIB)
+ ../lib/dfa.a ../lib/alexutil.a
$(CC) $(CFLAGS) -o $(TPROG3) $(O3) \
../lib/rset.a ../lib/dict.a ../lib/isam.a ../lib/bfile.a \
../lib/dfa.a ../lib/alexutil.a \