From 7b58e36bc4c5a57dec46408bbfb3707638dd967a Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 6 Jun 1996 11:10:04 +0000 Subject: [PATCH] Minor changes. --- Makefile | 16 ++++++++++------ www/Makefile | 6 +++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index fed75db..11a3c94 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Top level Makefile for the Z39.50 gateway (Web and email) # Europagate, 1995-1996. # -# $Id: Makefile,v 1.33 1996/06/06 10:34:31 adam Exp $ +# $Id: Makefile,v 1.34 1996/06/06 11:10:04 adam Exp $ # SHELL=/bin/sh MAKE=make @@ -27,11 +27,11 @@ EGWDIR=$(HTTPDDIR)/egw GIFDIR=$(HTDOCS)/egwgif # Location of Tcl -TCLLIB=/usr/local/lib/libtcl7.5.a -TCLINC= +TCLLIB=/usr/local/lib/libtcl7.5.a -lm +TCLINC=-I/usr/local/include # Location of IrTcl -IRTCLDIR=../../ir-tcl +IRTCLDIR=../ir-tcl IRTCLLIB=$(IRTCLDIR)/libirtcl.a IRTCLINC=-I$(IRTCLDIR) @@ -42,8 +42,8 @@ IRTCLINC=-I$(IRTCLDIR) # If you are using YAZ uncomment these lines ZACC=zlayer-yaz -ZINC=-I../../yaz/include -ZLIB=../../yaz/lib/libyaz.a +ZINC=-I../yaz/include +ZLIB=../yaz/lib/libyaz.a ZDEFS= # If you are using Zdist uncomment these lines @@ -61,6 +61,10 @@ SUBDIREMAIL=res+log util ccl fml $(ZACC) kernel SUBDIRWWW=res+log util www all: + @echo "Type 'make email' to make email gateway" + @echo "Type 'make web' to make web gateway" + +alll: for i in $(SUBDIR); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" ZINC="$(ZINC)" ZLIB="$(ZLIB)" CPP="$(CPP)" ELIB="$(ELIB)" REGEXOBJ="$(REGEXOBJ)" REGEXINC="$(REGEXINC)" ZDEFS="$(ZDEFS)" TCLLIB="$(TCLLIB)" TCLINC="$(TCLINC)" IRTCLLIB="$(IRTCLLIB)" IRTCLINC="$(IRTCLINC)" EGWDIR="$(EGWDIR)"; then cd ..; else exit 1; fi; done email: diff --git a/www/Makefile b/www/Makefile index 92905ad..bc47ff9 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,7 +1,7 @@ # Makefile for www gateway utility # Europagate, 1995 # -# $Id: Makefile,v 1.40 1996/05/31 08:02:54 adam Exp $ +# $Id: Makefile,v 1.41 1996/06/06 11:10:10 adam Exp $ # SHELL=/bin/sh @@ -53,7 +53,7 @@ $(TPROG1): $(P1) $(OLIB) $(TPROG2): $(P2) $(OLIB) $(CC) $(CFLAGS) -o $(TPROG2) $(P2) $(OLIB) $(IRTCLLIB) \ - $(ZLIB) $(MOSILIB) $(TCLLIB) $(ELIB) -lm + $(ZLIB) $(MOSILIB) $(TCLLIB) $(ELIB) $(TPROG3): $(P3) $(OLIB) $(CC) $(CFLAGS) -o $(TPROG3) $(P3) $(OLIB) $(ELIB) @@ -65,7 +65,7 @@ WAISLIB=$(IRTCLDIR)/wais-tcl.o $(WAISDIR)/ir/libwais.a $(TPROG4): $(P4) $(OLIB) $(CC) $(CFLAGS) -o $(TPROG4) $(P4) \ $(OLIB) $(IRTCLLIB) \ - $(WAISLIB) $(ZLIB) $(MOSILIB) $(TCLLIB) $(ELIB) -lm + $(WAISLIB) $(ZLIB) $(MOSILIB) $(TCLLIB) $(ELIB) install: install.prog install.script install.gif -- 1.7.10.4