X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=util%2FMakefile;h=047e7cc793e61779e85194b8d25dc3d0f3e2c40c;hb=41c09d8b6ab58b149435a6f87cd9f738fe7d86f5;hp=2e3efcba9c99dfebb68136c4b281d691e559d30c;hpb=d4c12ec7c451e74a949cc7c8d5fef226c995ddc6;p=yaz-moved-to-github.git

diff --git a/util/Makefile b/util/Makefile
index 2e3efcb..047e7cc 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -1,18 +1,20 @@
-# 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.9 1995-05-22 11:32:15 quinn Exp $
+# $Id: Makefile,v 1.25 1997-10-27 14:04:21 adam Exp $
 
 SHELL=/bin/sh
 INCLUDE=-I../include -I.
 LIBDIR=../lib
 LIBINCLUDE=-L$(LIBDIR)
-#CFLAGS=-g -Wall -pedantic -ansi
-DEFS=$(INCLUDE)
+DEFS=$(INCLUDE) $(CDEFS)
+#DEFS=$(INCLUDE) $(CDEFS) -DTRACE_XMALLOC=1
 LIB=$(LIBDIR)/libutil.a
 LIBS=
-PO = options.o log.o marcdisp.o yaz-ccl.o # dmalloc.o
+PO = options.o log.o marcdisp.o yaz-ccl.o pquery.o oid.o wrbuf.o nmemsdup.o \
+	xmalloc.o readconf.o tpath.o nmem.o yaz-util.o atoin.o # dmalloc.o 
 CPP=$(CC) -E
+RANLIB=ranlib
 
 all: $(LIBDIR) $(LIB) marcdump
 
@@ -27,7 +29,7 @@ alll:
 $(LIB): $(PO)
 	rm -f $(LIB)
 	ar qc $(LIB) $(PO)
-	ranlib $(LIB)
+	$(RANLIB) $(LIB)
 
 $(LIBDIR):
 	mkdir $(LIBDIR)
@@ -41,13 +43,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