X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2FMakefile;h=3281cf5c15971ed0d55707c8d90110e3d5e4697c;hb=b9093505b17a074e79137ed64595c8269f77d330;hp=2ec95a76cd5304c40a19f10ef0393fc25132f1b1;hpb=eb2835ce4780c112020defac4b2ac24062858335;p=idzebra-moved-to-github.git

diff --git a/util/Makefile b/util/Makefile
index 2ec95a7..3281cf5 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -1,72 +1,51 @@
-# Copyright (C) 1994, Index Data I/S 
+# Copyright (C) 1994-1996, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.12 1994-09-19 16:34:38 adam Exp $
+# $Id: Makefile,v 1.26 1997-09-17 12:19:23 adam Exp $
 
 SHELL=/bin/sh
-INCLUDE=-I../include
+RANLIB=ranlib
+
+YAZLIB=-lyaz
+YAZINC=-I../../yaz/include
+
+INCLUDE=-I../include $(YAZINC)
 TPROG=opt-test
-CFLAGS=-g -Wall -pedantic
 DEFS=$(INCLUDE)
-LIB=../lib/util.a
-PO = options.o xmalloc.o log.o res.o alexpath.o common.o
-CPP=cc -E
+CPP=$(CC) -E
+LIB=../lib/zebrautl.a
+PO = res.o charmap.o
 
 all: $(LIB)
 
-opt-test: opt-test.o $(LIB) 
-	$(CC) -o opt-test opt-test.o $(LIB)
+alll: res-test all
 
-res-test: res-test.o $(LIB)
-	$(CC) -o res-test res-test.o $(LIB)
+res-test: res-test.o $(LIB) 
+	$(CC) -o res-test res-test.o $(LIB) $(YAZLIB)
 
 $(LIB): $(PO)
 	rm -f $(LIB)
 	ar qc $(LIB) $(PO)
-	ranlib $(LIB)
+	$(RANLIB) $(LIB)
 
 .c.o:
 	$(CC) -c $(DEFS) $(CFLAGS) $<
 
 clean:
-	rm -f *.[oa] opt-test res-test core mon.out gmon.out errlist
+	rm -f *.[oa] res-test core mon.out gmon.out errlist
+
+depend: depend2
+
+depend1:
+	sed '/^#Depend/q' <Makefile >Makefile.tmp
+	$(CPP) $(DEFS) -M *.c >>Makefile.tmp
+	mv -f Makefile.tmp Makefile
+
+depend2:
+	$(CPP) $(DEFS) -M *.c >.depend	
 
-dep depend:
-	mv Makefile Makefile.tmp
-	sed '/^#Depend/q' <Makefile.tmp >Makefile
-	$(CPP) $(INCLUDE) -M *.c >>Makefile
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif
 
 #Depend --- DOT NOT DELETE THIS LINE
-alexpath.o : alexpath.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 /usr/include/string.h ../include/util.h ../include/log.h \
-  ../include/options.h ../include/xmalloc.h /usr/include/sys/types.h /usr/include/linux/types.h \
-  ../include/res.h ../include/alexpath.h ../include/common.h 
-common.o : common.c ../include/util.h ../include/log.h ../include/options.h \
-  ../include/xmalloc.h /usr/include/sys/types.h /usr/include/linux/types.h ../include/res.h \
-  ../include/alexpath.h ../include/common.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/lib/gcc-lib/i486-linux/2.5.8/include/stdarg.h \
-  /usr/include/errno.h /usr/include/linux/errno.h 
-opt-test.o : opt-test.c /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/libio.h /usr/include/_G_config.h ../include/options.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 
-res-test.o : res-test.c /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/libio.h /usr/include/_G_config.h ../include/util.h ../include/log.h \
-  ../include/options.h ../include/xmalloc.h /usr/include/sys/types.h /usr/include/linux/types.h \
-  ../include/res.h ../include/alexpath.h ../include/common.h 
-res.o : res.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 /usr/include/string.h /usr/include/assert.h /usr/include/unistd.h \
-  /usr/include/posix_opt.h /usr/include/gnu/types.h /usr/include/sys/types.h /usr/include/linux/types.h \
-  ../include/util.h ../include/log.h ../include/options.h ../include/xmalloc.h \
-  ../include/res.h ../include/alexpath.h ../include/common.h 
-xmalloc.o : xmalloc.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 /usr/include/string.h ../include/xmalloc.h /usr/include/sys/types.h \
-  /usr/include/linux/types.h