X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2FMakefile;h=96a0d68a8234077dc899762920c4587298a82990;hb=97e0cd0e1341f4b75216dec7c95f7a4627f4e63d;hp=7b3dfd2ad84ccfbe6fd08e54e31af0df573de7d1;hpb=f26c147b7e348a8e0b91364f4a4d100dc1832467;p=yaz-moved-to-github.git

diff --git a/util/Makefile b/util/Makefile
index 7b3dfd2..96a0d68 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -1,30 +1,34 @@
-# 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.1 1995-03-27 08:35:16 quinn Exp $
+# $Id: Makefile,v 1.26 1997-10-31 12:20:09 adam Exp $
 
 SHELL=/bin/sh
-INCLUDE=-I../include -I. -I../odr
-LIBDIR=../../lib
+INCLUDE=-I../include -I.
+LIBDIR=../lib
 LIBINCLUDE=-L$(LIBDIR)
-#CFLAGS=-g -Wall -pedantic -ansi
-DEFS=$(INCLUDE)
+DEFS=$(INCLUDE) $(CDEFS)
 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 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)
+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,18 +37,17 @@ $(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	
+	$(CPP) $(DEFS) -M *.c >.depend	
 
 ifeq (.depend,$(wildcard .depend))
 include .depend