X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2FMakefile;h=441d771c4e46d42395a8bfaf8ba2308dd4d0da12;hp=27481a6757ab72196ddac461f17bdfaee742f659;hb=b5bc2a31ad5125dc6d3ed1b6e626f0b9d22618bb;hpb=a4b3ddd8ad754b42454c7a18fdb3ef61f7bd580d diff --git a/util/Makefile b/util/Makefile index 27481a6..441d771 100644 --- a/util/Makefile +++ b/util/Makefile @@ -1,19 +1,17 @@ -# 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.19 1996-02-20 16:41:36 adam 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) -DTRACE_XMALLOC=1 +DEFS=$(INCLUDE) $(CDEFS) LIB=$(LIBDIR)/libutil.a LIBS= -PO = options.o log.o marcdisp.o yaz-ccl.o pquery.o oid.o wrbuf.o \ - xmalloc.o readconf.o tpath.o nmem.o yaz-util.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 @@ -32,9 +30,6 @@ $(LIB): $(PO) ar qc $(LIB) $(PO) $(RANLIB) $(LIB) -$(LIBDIR): - mkdir $(LIBDIR) - .c.o: $(CC) -c $(DEFS) $(CFLAGS) $< @@ -49,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