X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2FMakefile;h=27481a6757ab72196ddac461f17bdfaee742f659;hp=7ae36fde1170631f6a533572b48627e793070322;hb=d1c517a616a425f6a6966ae1639176248e65e68a;hpb=f3dd50f81c9aed6768a88b253615d6667cd92a35

diff --git a/util/Makefile b/util/Makefile
index 7ae36fd..27481a6 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.5 1995-04-10 10:23:49 quinn Exp $
+# $Id: Makefile,v 1.19 1996-02-20 16:41:36 adam Exp $
 
 SHELL=/bin/sh
 INCLUDE=-I../include -I.
@@ -9,10 +9,13 @@ LIBDIR=../lib
 LIBINCLUDE=-L$(LIBDIR)
 #CFLAGS=-g -Wall -pedantic -ansi
 DEFS=$(INCLUDE)
+#DEFS=$(INCLUDE) -DTRACE_XMALLOC=1
 LIB=$(LIBDIR)/libutil.a
 LIBS=
-PO = dmalloc.o options.o log.o marcdisp.o
+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 
 CPP=$(CC) -E
+RANLIB=ranlib
 
 all: $(LIBDIR) $(LIB) marcdump
 
@@ -27,7 +30,7 @@ alll:
 $(LIB): $(PO)
 	rm -f $(LIB)
 	ar qc $(LIB) $(PO)
-	ranlib $(LIB)
+	$(RANLIB) $(LIB)
 
 $(LIBDIR):
 	mkdir $(LIBDIR)
@@ -36,44 +39,20 @@ $(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: depend1
+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	
 
-#ifeq (.depend,$(wildcard .depend))
-#include .depend
-#endif
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif
 
 #Depend --- DOT NOT DELETE THIS LINE
-dmalloc.o : dmalloc.c /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h /usr/include/errno.h /usr/include/linux/errno.h \
-  /usr/lib/gcc-lib/i486-linux/2.5.8/include/float.h /usr/include/alloca.h /usr/include/stdio.h \
-  /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h 
-log.o : log.c ../include/log.h /usr/include/stdio.h /usr/include/features.h \
-  /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/stdlib.h \
-  /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h /usr/include/errno.h /usr/include/linux/errno.h \
-  /usr/lib/gcc-lib/i486-linux/2.5.8/include/float.h /usr/include/alloca.h /usr/include/ctype.h \
-  /usr/lib/gcc-lib/i486-linux/2.5.8/include/stdarg.h 
-marcdisp.o : marcdisp.c /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h \
-  /usr/include/ctype.h ../include/marcdisp.h 
-marcdump.o : marcdump.c /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/libio.h /usr/include/_G_config.h /usr/include/stdlib.h /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h \
-  /usr/include/errno.h /usr/include/linux/errno.h /usr/lib/gcc-lib/i486-linux/2.5.8/include/float.h \
-  /usr/include/alloca.h ../include/marcdisp.h 
-options.o : options.c /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h /usr/include/errno.h /usr/include/linux/errno.h \
-  /usr/lib/gcc-lib/i486-linux/2.5.8/include/float.h /usr/include/alloca.h ../include/options.h 
-query.o : query.c /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/libio.h /usr/include/_G_config.h /usr/include/ctype.h /usr/include/string.h \
-  /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/odr.h ../include/prt.h \
-  ../include/dmalloc.h ../include/proto.h ../include/odr_use.h