X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2FMakefile;h=acbf7160637f7832802f484e19e6a7573f26c018;hb=eeefdb17312edc896a6f6182bca6a5fc9bf22189;hp=733cd68790cac5521308dd7ccb1c8b8646dfa7c1;hpb=1b29b77f09ae310c41f9cd0a6eeea2d562b7729e;p=idzebra-moved-to-github.git

diff --git a/util/Makefile b/util/Makefile
index 733cd68..acbf716 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -1,48 +1,49 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.15 1994-10-04 17:47:09 adam Exp $
+# $Id: Makefile,v 1.21 1995-11-20 11:58:16 adam Exp $
 
 SHELL=/bin/sh
-INCLUDE=-I../include
+RANLIB=ranlib
+
+YAZLIB=-lyaz
+YAZINC=
+
+INCLUDE=-I../include $(YAZINC)
 TPROG=opt-test
-CFLAGS=-g -Wall -pedantic
+#CFLAGS=-g -Wall -pedantic -ansi
 DEFS=$(INCLUDE)
-LIB=../lib/util.a
-PO = options.o xmalloc.o log.o res.o alexpath.o common.o
-CPP=cc -E
+CPP=$(CC) -E
+LIB=../lib/alexutil.a
+PO = res.o alexpath.o common.o
 
 all: $(LIB)
 
-alll: opt-test res-test all
-
-opt-test: opt-test.o $(LIB) 
-	$(CC) -o opt-test opt-test.o $(LIB)
+alll: res-test all
 
-res-test: res-test.o $(LIB)
-	$(CC) -o res-test res-test.o $(LIB)
+res-test: res-test.o $(LIB) 
+	$(CC) -o res-test res-test.o $(LIB) $(YAZLIB)
 
 $(LIB): $(PO)
 	rm -f $(LIB)
 	ar qc $(LIB) $(PO)
-	ranlib $(LIB)
+	$(RANLIB) $(LIB)
 
 .c.o:
 	$(CC) -c $(DEFS) $(CFLAGS) $<
 
 clean:
-	rm -f *.[oa] opt-test res-test core mon.out gmon.out errlist
+	rm -f *.[oa] res-test 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