X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=Makefile;h=e8411ceb88715f629228cf6d6e40a9a6e3fe43ad;hp=2b29b8640b69069c27a663588673c512838fe875;hb=eb0f67241481fb645a377b1c5df9683f8f1bd2fb;hpb=42dcb6fd4b9fccb404c4403e0d63c2bfb31cabbb diff --git a/Makefile b/Makefile index 2b29b86..e8411ce 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -# Copyright (C) 1994, Index Data I/S +# Copyright (C) 1995-1997, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.31 1996-11-08 11:03:02 adam Exp $ +# $Id: Makefile,v 1.35 1997-09-17 12:10:27 adam Exp $ # Uncomment the lines below to enable mOSI communcation. #ODEFS=-DUSE_XTIMOSI @@ -9,11 +9,11 @@ #LIBMOSI=../../xtimosi/src/libmosi.a ../lib/librfc.a #XMOSI=xmosi.o -CDEFS=$(ODEFS) +CDEFS=$(ODEFS) # -DYAZ_UNICODE=0 #CC= SHELL=/bin/sh MAKE=make -SUBDIR=util odr asn $(RFC1006) ccl comstack retrieval client server makelib +SUBDIR=util odr asn $(RFC1006) ccl comstack retrieval client server ztest makelib # Add external libraries to the ELIBS macro ELIBS= CONTROL=RANLIB="ranlib" ELIBS="$(ELIBS)" @@ -29,11 +29,12 @@ YAZDIR=/usr/local/lib/yaz all: for i in $(SUBDIR); do cd $$i; if $(MAKE) $(CONTROL) \ - CFLAGS="$(CFLAGS) $(CDEFS)" LIBMOSI="$(LIBMOSI)" XMOSI="$(XMOSI)";\ + CFLAGS="$(CFLAGS)" CDEFS="$(CDEFS)" LIBMOSI="$(LIBMOSI)" XMOSI="$(XMOSI)";\ then cd ..; else exit 1; fi; done dep depend: - for i in $(SUBDIR); do cd $$i; if $(MAKE) depend; then cd ..; else exit 1; fi; done + for i in $(SUBDIR); do cd $$i; if $(MAKE) CDEFS="$(CDEFS)" depend;\ + then cd ..; else exit 1; fi; done clean: for i in $(SUBDIR); do (cd $$i; $(MAKE) clean); done @@ -122,4 +123,4 @@ install.misc: wc: wc `find . -name '*.[ch]'` - +