X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2FMakefile;h=441d771c4e46d42395a8bfaf8ba2308dd4d0da12;hp=c98821a2bdc15fcf24fba9b17e28cf5aaeaccc0b;hb=b5bc2a31ad5125dc6d3ed1b6e626f0b9d22618bb;hpb=ddd998ca83ffe16e7548f0717d218d32a2b57a33

diff --git a/util/Makefile b/util/Makefile
index c98821a..441d771 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -1,18 +1,19 @@
-# 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.12 1995-05-30 10:25:47 quinn Exp $
+# $Id: Makefile,v 1.27 1998-05-18 10:10:01 adam Exp $
 
 SHELL=/bin/sh
 INCLUDE=-I../include -I.
 LIBDIR=../lib
 LIBINCLUDE=-L$(LIBDIR)
-#CFLAGS=-g -Wall -pedantic -ansi
-DEFS=$(INCLUDE)
+DEFS=$(INCLUDE) $(CDEFS)
 LIB=$(LIBDIR)/libutil.a
 LIBS=
-PO = options.o log.o marcdisp.o yaz-ccl.o pquery.o oid.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,10 +28,7 @@ alll:
 $(LIB): $(PO)
 	rm -f $(LIB)
 	ar qc $(LIB) $(PO)
-	ranlib $(LIB)
-
-$(LIBDIR):
-	mkdir $(LIBDIR)
+	$(RANLIB) $(LIB)
 
 .c.o:
 	$(CC) -c $(DEFS) $(CFLAGS) $<
@@ -46,7 +44,7 @@ depend1:
 	mv -f Makefile.tmp Makefile
 
 depend2:
-	$(CPP) $(INCLUDE) -M *.c >.depend	
+	$(CPP) $(DEFS) -M *.c >.depend	
 
 ifeq (.depend,$(wildcard .depend))
 include .depend