X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2FMakefile;h=fcdc9cd45ba3a51375186556f56b2bc3c0eda560;hb=5b886a7358c16434d5c9f5f0d4af2f6e2e5d5c73;hp=477739c2fc5cebbc8ee6b4a4979be1322b06f5e2;hpb=ddfc9499c27bb4b90797bab12868f629afee34e3;p=idzebra-moved-to-github.git

diff --git a/util/Makefile b/util/Makefile
index 477739c..fcdc9cd 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -1,46 +1,48 @@
-# Copyright (C) 1994, Index Data I/S 
+# Copyright (C) 1994-1996, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.14 1994-09-22 10:45:19 adam Exp $
+# $Id: Makefile,v 1.27 1997-10-27 14:33:06 adam Exp $
 
 SHELL=/bin/sh
-INCLUDE=-I../include
+RANLIB=ranlib
+
+YAZLIB=-lyaz
+YAZINC=-I../../yaz/include
+
+INCLUDE=-I../include $(YAZINC)
 TPROG=opt-test
-CFLAGS=-g -Wall -pedantic
 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/zebrautl.a
+PO = res.o charmap.o zebramap.o
 
 all: $(LIB)
 
-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