X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2FMakefile;h=e4b5e2bc2f4a2a1c62855219faa3de7fde61de73;hb=f1e7c832bcf4e2ecaaefc01a1cec1ba78e90dd12;hp=d68c3db5584dfa3b3093ae9e8f34e3fd6285497b;hpb=f5dc6557f3074640f978efa62616868e0029cf93;p=idzebra-moved-to-github.git

diff --git a/rset/Makefile b/rset/Makefile
index d68c3db..e4b5e2b 100644
--- a/rset/Makefile
+++ b/rset/Makefile
@@ -1,27 +1,27 @@
-# Copyright (C) 1994, Index Data I/S 
+# Copyright (C) 1994-1998, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.3 1995-01-24 16:01:44 adam Exp $
+# $Id: Makefile,v 1.15 1998-03-05 08:36:27 adam Exp $
 
 SHELL=/bin/sh
-INCLUDE=-I../include
-CFLAGS=-g -Wall -pedantic -ansi
+RANLIB=ranlib
+
+YAZLIB=../../yaz/lib/libyaz.a
+YAZINC=-I../../yaz/include
+
+INCLUDE=-I../include $(YAZINC)
 DEFS=$(INCLUDE)
 LIB=../lib/rset.a
 PROG=
-PO=rset.o rstemp.o rsisam.o
-CPP=cc -E
-
-all: $(PROG) $(LIB)
-
-$(PROG): $(PROG).o
-	$(CC) -o $(PROG) $(INCLUDE) $(CFLAGS) $(PROG).o $(LIB)
+PO=rset.o rstemp.o rsisam.o rsnull.o rsbool.o rsisamc.o rsm_or.o
+CPP=$(CC) -E
 
+all: $(LIB)
 
 $(LIB): $(PO)
 	rm -f $(LIB)
 	ar qc $(LIB) $(PO)
-	ranlib $(LIB)
+	$(RANLIB) $(LIB)
 
 .c.o:
 	$(CC) -c $(DEFS) $(CFLAGS) $<
@@ -32,13 +32,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