X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2FMakefile;h=441d771c4e46d42395a8bfaf8ba2308dd4d0da12;hb=348e11131385e72241a04997e90c8c77147e6423;hp=1439bf0887f19bb6c286b9c134b2023d8a570bda;hpb=bc39d5bc3e621e09a0d8b0b912a4e4dfaf43d087;p=yaz-moved-to-github.git diff --git a/util/Makefile b/util/Makefile index 1439bf0..441d771 100644 --- a/util/Makefile +++ b/util/Makefile @@ -1,18 +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.20 1996-05-22 08:36:07 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) -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 @@ -31,9 +30,6 @@ $(LIB): $(PO) ar qc $(LIB) $(PO) $(RANLIB) $(LIB) -$(LIBDIR): - mkdir $(LIBDIR) - .c.o: $(CC) -c $(DEFS) $(CFLAGS) $< @@ -48,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