X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2FMakefile;h=e45da01c470b0db129893ada716ef988701c09e5;hb=b8844c65622c12fb105bf7fc6bab2fc237af7c14;hp=f32eb89fe71c531403e45a3591b691fff049af07;hpb=f8a58c40f789bc7f0694ad085b6af815a5ee1fc3;p=idzebra-moved-to-github.git

diff --git a/util/Makefile b/util/Makefile
index f32eb89..e45da01 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -1,39 +1,51 @@
-# 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.13 1994-09-20 09:03:03 adam Exp $
+# $Id: Makefile,v 1.24 1996-05-31 09:07:17 quinn 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/alexutil.a
+PO = res.o alexpath.o common.o charmap.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:
+	sed '/^#Depend/q' <Makefile >Makefile.tmp
+	$(CPP) $(DEFS) -M *.c >>Makefile.tmp
+	mv -f Makefile.tmp Makefile
+
+depend2:
+	$(CPP) $(DEFS) -M *.c >.depend	
 
-dep depend:
-	mv Makefile Makefile.tmp
-	sed '/^#Depend/q' <Makefile.tmp >Makefile
-	$(CPP) $(INCLUDE) -M *.c >>Makefile
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif
 
 #Depend --- DOT NOT DELETE THIS LINE