X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2FMakefile;h=11d3b941ac0b972a2cc1ebcf37ead31cad238bb4;hb=25db261b6bbbfcc7bc26f679f195b51d31b9d7d7;hp=f1b6fa94c42e3cf9641b7a7bcd2c831effc2acb4;hpb=c38544a87dfb550dfe4731c450bbde093c095bde;p=egate.git

diff --git a/www/Makefile b/www/Makefile
index f1b6fa9..11d3b94 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,22 +1,23 @@
 # Makefile for www gateway utility
 # Europagate, 1995
 #
-# $Id: Makefile,v 1.30 1996/02/19 15:44:59 adam Exp $
+# $Id: Makefile,v 1.32 1996/02/29 15:41:38 adam Exp $
 #
 SHELL=/bin/sh
-#
-ZDEFS=
-#ZINC=-I../../yaz/include
+
 ZLIB=../../yaz/lib/libyaz.a
-#ZLIB=-lyaz
+
+IRTCLDIR=../../ir-tcl
+IRTCLLIB=$(IRTCLDIR)/libirtcl.a
+IRTCLINC=-I$(IRTCLDIR)
+
 #MOSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a
-LIBIRTCL=../../ir-tcl/libirtcl.a $(ZLIB) $(MOSILIB)
 #NETLIB=-lnsl -lsocket
-#
+
 OLIB=../lib/util.a ../lib/libres+log.a 
 TCLLIB=/usr/local/lib/libtcl7.5.a
-TCLINC=-I../../ir-tcl -I/usr/local/include 
-#
+TCLINC=
+
 WSCRIPTS=egwscript targets.egw query.egw search.egw showfull.egw z39util.tcl \
  mtargets.egw mquery.egw msearch.egw history.egw tform.egw tdefine.egw
 HSCRIPTS=egwindex.html
@@ -24,9 +25,11 @@ CONFFILES=egw.res ztargets.conf
 TPROG1=egwcgi
 TPROG2=egwsh
 TPROG3=wtest
+TPROG4=egwwais
 P1=wcgi.o
-P2=wproto.o winterp.o wsh.o wtcl.o whtml.o wirtcl.o
+P2=wproto.o winterp.o wsh.o wtcl.o whtml.o wirtcl.o wshmain.o
 P3=wproto.o wtest.o
+P4=wproto.o winterp.o waissh.o wtcl.o wirtcl.o wshmain.o wwaistcl.o
 CPP=$(CC) -E
 
 HTTPDDIR=/usr/local/etc/httpd
@@ -43,20 +46,28 @@ GIFDIR=$(HTDOCS)/egwgif
 #LOGDIR=/data2/html/egw/logs
 #GIFDIR=/data2/html/egw/gif
 
-INCLUDE=-I../include $(ZINC) $(TCLINC)
-DEFS=$(INCLUDE) $(ZDEFS) -DEGWDIR=\"$(EGWDIR)\" 
+INCLUDE=-I../include $(TCLINC) $(IRTCLINC)
+DEFS=$(INCLUDE) $(ZDEFS) -DEGWDIR=\"$(EGWDIR)\"
 
 all: $(TPROG1) $(TPROG2)
 
 $(TPROG1): $(P1) $(OLIB)
-	$(CC) $(CFLAGS) -o $(TPROG1) $(P1) $(OLIB) $(ZLIB)
+	$(CC) $(CFLAGS) -o $(TPROG1) $(P1) $(OLIB)
 
 $(TPROG2): $(P2) $(OLIB)
-	$(CC) $(CFLAGS) -o $(TPROG2) $(P2) $(OLIB) $(LIBIRTCL) \
-		$(NETLIB) $(TCLLIB) -lm
+	$(CC) $(CFLAGS) -o $(TPROG2) $(P2) $(OLIB) $(IRTCLLIB) \
+		$(ZLIB) $(MOSILIB) $(NETLIB) $(TCLLIB) -lm
 
 $(TPROG3): $(P3) $(OLIB)
-	$(CC) $(CFLAGS) -o $(TPROG3) $(P3) $(OLIB) $(ZLIB)
+	$(CC) $(CFLAGS) -o $(TPROG3) $(P3) $(OLIB)
+
+
+WAISDIR=../../freeWAIS-sf-2.0
+WAISLIB=$(IRTCLDIR)/wais-tcl.o $(WAISDIR)/ir/libwais.a
+
+$(TPROG4): $(P4) $(OLIB)
+	$(CC) $(CFLAGS) -o $(TPROG4) $(P4) $(OLIB) $(IRTCLLIB) \
+		$(WAISLIB) $(ZLIB) $(MOSILIB) $(NETLIB) $(TCLLIB) -lm
 
 install: install.prog install.script install.gif