NMEM thread safe. NMEM must be initialized before use (sigh) -

[yaz-moved-to-github.git] / util / Makefile

diff --git a/util/Makefile b/util/Makefile
index c98821a..0a1b90d 100644 (file)
--- 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.12 1995-05-30 10:25:47 quinn Exp $
+# $Id: Makefile,v 1.24 1997-09-17 12:10:42 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) -DTRACE_XMALLOC=1
 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,7 +29,7 @@ alll:
 $(LIB): $(PO)
        rm -f $(LIB)
        ar qc $(LIB) $(PO)
-       ranlib $(LIB)
+       $(RANLIB) $(LIB)
 
 $(LIBDIR):
        mkdir $(LIBDIR)
@@ -46,7 +48,7 @@ depend1:
        mv -f Makefile.tmp Makefile
 
 depend2:
-       $(CPP) $(INCLUDE) -M *.c >.depend       
+       $(CPP) $(DEFS) -M *.c >.depend  
 
 ifeq (.depend,$(wildcard .depend))
 include .depend