Modified Data1-system to use nmem

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

diff --git a/util/Makefile b/util/Makefile
index 05289b7..87b1967 100644 (file)
--- a/util/Makefile
+++ b/util/Makefile
@@ -1,30 +1,35 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.2 1995-03-30 09:39:45 quinn Exp $
+# $Id: Makefile,v 1.17 1995-11-08 17:41:43 quinn Exp $
 
 SHELL=/bin/sh
 INCLUDE=-I../include -I.
-LIBDIR=../../lib
+LIBDIR=../lib
 LIBINCLUDE=-L$(LIBDIR)
 #CFLAGS=-g -Wall -pedantic -ansi
 DEFS=$(INCLUDE)
 LIB=$(LIBDIR)/libutil.a
 LIBS=
-PO = dmalloc.o options.o
-CPP=cc -E
+PO = options.o log.o marcdisp.o yaz-ccl.o pquery.o oid.o wrbuf.o \
+       xmalloc.o readconf.o tpath.o nmem.o # dmalloc.o 
+CPP=$(CC) -E
+RANLIB=ranlib
 
-all: $(LIBDIR) $(LIB)
+all: $(LIBDIR) $(LIB) marcdump
 
 #test: test.o $(LIB) ../odr/odr.a
 #      $(CC) $(CFLAGS) $(INCLUDE) -o test test.o $(LIB) ../odr/odr.a
 
+marcdump: marcdump.o $(LIB)
+       $(CC) $(CFLAGS) $(INCLUDE) -o marcdump marcdump.o $(LIB)
+
 alll:
 
 $(LIB): $(PO)
        rm -f $(LIB)
        ar qc $(LIB) $(PO)
-       ranlib $(LIB)
+       $(RANLIB) $(LIB)
 
 $(LIBDIR):
        mkdir $(LIBDIR)
@@ -33,15 +38,14 @@ $(LIBDIR):
        $(CC) -c $(DEFS) $(CFLAGS) $<
 
 clean:
-       rm -f *.[oa] test core mon.out gmon.out errlist
+       rm -f *.[oa] test marcdump 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