X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isam%2FMakefile;h=973734794a634421cb321c3813c259e9636f4969;hb=c9ac021f1381269609f3654384698f398cf46b96;hp=341ee3ee555861b1fe78e3ee07928ac11e09f151;hpb=a5545de18b5d3762a1f29569a4b10ca5017506db;p=idzebra-moved-to-github.git

diff --git a/isam/Makefile b/isam/Makefile
index 341ee3e..9737347 100644
--- a/isam/Makefile
+++ b/isam/Makefile
@@ -1,31 +1,35 @@
-# Copyright (C) 1994, Index Data I/S 
+# Copyright (C) 1994-1997, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.11 1994-09-27 20:03:50 quinn Exp $
+# $Id: Makefile,v 1.21 1997-09-17 12:19:20 adam Exp $
 
 SHELL=/bin/sh
-INCLUDE=-I../include
-CFLAGS=-g -Wall -pedantic
+RANLIB=ranlib
+
+YAZLIB=../../yaz/lib/libyaz.a
+YAZINC=-I../../yaz/include
+
+INCLUDE=-I../include $(YAZINC)
 DEFS=$(INCLUDE)
 LIB=../lib/isam.a
 PO = isam.o isutil.o rootblk.o memory.o physical.o
-CPP=cc -E
+CPP=$(CC) -E
 
 all: $(LIB)
 
-alll: $(LIB) isam-test issh
+alll: $(LIB) # isam-test issh
 
 test: test.c $(LIB)
 	$(CC) -g -o test -I../include test.c \
-	../lib/isam.a ../lib/bfile.a ../lib/util.a
+	../lib/isam.a ../lib/bfile.a ../lib/zebrautl.a $(YAZLIB)
 
 isam-test: isam-test.c $(LIB)
 	$(CC) -g -o isam-test -I../include isam-test.c \
-	../lib/isam.a ../lib/bfile.a ../lib/util.a
+	../lib/isam.a ../lib/bfile.a ../lib/zebrautl.a $(YAZLIB)
 
 issh: issh.c $(LIB)
-	$(CC) -g -o issh -I../include issh.c \
-	../lib/isam.a ../lib/bfile.a ../lib/util.a
+	$(CC) -g -o issh $(INCLUDE) issh.c \
+	../lib/isam.a ../lib/bfile.a ../lib/zebrautl.a $(YAZLIB)
 
 #$(TPROG): $(TPROG).o $(LIB) 
 #	$(CC) -o $(TPROG) $(TPROG).o $(LIB)
@@ -33,7 +37,7 @@ issh: issh.c $(LIB)
 $(LIB): $(PO)
 	rm -f $(LIB)
 	ar qc $(LIB) $(PO)
-	ranlib $(LIB)
+	$(RANLIB) $(LIB)
 
 .c.o:
 	$(CC) -c $(DEFS) $(CFLAGS) $<
@@ -44,13 +48,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