Various cleanup. YAZ util used instead.

[idzebra-moved-to-github.git] / index / Makefile

diff --git a/index/Makefile b/index/Makefile
index f7377ae..aa0a2d6 100644 (file)
--- a/index/Makefile
+++ b/index/Makefile
@@ -1,10 +1,13 @@
 # Copyright (C) 1995, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.4 1995-09-04 09:10:34 adam Exp $
+# $Id: Makefile,v 1.5 1995-09-04 12:33:40 adam Exp $
 
 SHELL=/bin/sh
-INCLUDE=-I../include -I../../yaz/include
+RANLIB=ranlib
+YAZ=../../yaz
+YAZLIB=$(YAZ)/lib/libyaz.a
+INCLUDE=-I../include -I$(YAZ)/include
 TPROG1=index
 TPROG2=kdump
 TPROG3=zserver
@@ -16,34 +19,37 @@ CPP=cc -E
 
 all: $(TPROG1) $(TPROG2) $(TPROG3)
 
-$(TPROG1): $(O1) ../lib/dict.a ../lib/isam.a ../lib/bfile.a ../lib/util.a
-       $(CC) $(CFLAGS) -o $(TPROG1) $(O1) ../lib/dict.a ../lib/isam.a ../lib/bfile.a ../lib/util.a
+$(TPROG1): $(O1) ../lib/dict.a \
+               ../lib/isam.a ../lib/bfile.a ../lib/alexutil.a $(YAZLIB)
+       $(CC) $(CFLAGS) -o $(TPROG1) $(O1) ../lib/dict.a \
+               ../lib/isam.a ../lib/bfile.a ../lib/alexutil.a $(YAZLIB)
 
-$(TPROG2): $(O2) ../lib/util.a
-       $(CC) $(CFLAGS) -o $(TPROG2) $(O2) ../lib/util.a
-
-$(TPROG3): $(O3) ../lib/dict.a ../lib/isam.a ../lib/bfile.a ../lib/rset.a ../lib/util.a
-       $(CC) $(CFLAGS) -o $(TPROG3) $(O3) ../lib/rset.a ../lib/dict.a ../lib/isam.a ../lib/bfile.a ../lib/util.a
+$(TPROG2): $(O2) $(YAZLIB)
+       $(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)
+       $(CC) $(CFLAGS) -o $(TPROG3) $(O3) ../lib/rset.a \
+               ../lib/dict.a ../lib/isam.a ../lib/bfile.a \
+               ../lib/dfa.a ../lib/alexutil.a $(YAZLIB)
 
 .c.o:
        $(CC) -c $(DEFS) $(CFLAGS) $<
 
 clean:
-       rm -f *.[oa] $(TPROG1) $(TPROG2) core mon.out gmon.out errlist
-
-$(O1) $(O2) $(O3): index.h
+       rm -f *.[oa] $(TPROG1) $(TPROG2) $(TPROG3)
+       rm -f core mon.out gmon.out errlist
 
 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