X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2FMakefile;h=bc47ff94e0416ac3361424a0e2d4220466b8bc7f;hb=644da8e5a840d868f7b31cf94fea111d0fa43a4a;hp=679f2eba7485eb4601dc482f16c5f3975cd2fa37;hpb=fa0ddb755d3a836e4e13cc05a6ba3eb6b0010958;p=egate.git

diff --git a/www/Makefile b/www/Makefile
index 679f2eb..bc47ff9 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,82 +1,113 @@
 # Makefile for www gateway utility
 # Europagate, 1995
 #
-# $Id: Makefile,v 1.25 1996/01/24 14:14:18 adam Exp $
+# $Id: Makefile,v 1.41 1996/06/06 11:10:10 adam Exp $
 #
 SHELL=/bin/sh
-#
-ZDEFS=
-ZINC=-I../../yaz/include
+
 ZLIB=../../yaz/lib/libyaz.a
-MOSILIB=../../xtimosi/src/libmosi.a -lrfc
-LIBIRTCL=../../ir-tcl/libirtcl.a $(ZLIB) $(MOSILIB)
-#NETLIB=-lnsl -lsocket
-#
+ZINC=-I../../yaz/include
+
+IRTCLDIR=../../ir-tcl
+IRTCLLIB=$(IRTCLDIR)/libirtcl.a
+IRTCLINC=-I$(IRTCLDIR)
+
+#MOSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a
+#ELIB=-lnsl -lsocket
+
 OLIB=../lib/util.a ../lib/libres+log.a 
-TCLLIB=/usr/local/lib/libtcl7.4.a
-TCLINC=-I/usr/local/include
-#
-WSCRIPTS=egwscript targets.egw query.egw search.egw showfull.egw z39util.tcl \
- mtargets.egw mquery.egw msearch.egw history.egw tform.egw tdefine.egw
+TCLLIB=/usr/local/lib/libtcl7.5.a
+TCLINC=
+
 HSCRIPTS=egwindex.html
-CONFFILES=ztargets.conf
+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
 CGIDIR=$(HTTPDDIR)/cgi-bin
 HTDOCS=$(HTTPDDIR)/htdocs
 EGWDIR=$(HTTPDDIR)/egw
-LOGDIR=$(HTTPDDIR)/logs
 GIFDIR=$(HTDOCS)/egwgif
 
 #HTTPDDIR=/usr/local/www
 #CGIDIR=/usr/local/www/cgi-bin
 #HTDOCS=/data2/html/egw/html
 #EGWDIR=/data2/html/egw/scripts
-#LOGDIR=/data2/html/egw/logs
 #GIFDIR=/data2/html/egw/gif
 
-INCLUDE=-I../include $(ZINC) $(TCLINC)
-DEFS=$(INCLUDE) $(ZDEFS) -DCGIDIR=\"$(CGIDIR)\" -DEGWDIR=\"$(EGWDIR)\" \
- -DLOGDIR=\"$(LOGDIR)\"
+INCLUDE=-I../include $(ZINC) $(TCLINC) $(IRTCLINC)
+DEFS=$(INCLUDE) $(ZDEFS) -DEGWDIR=\"$(EGWDIR)\"
 
 all: $(TPROG1) $(TPROG2)
 
-$(TPROG1): $(P1)
-	$(CC) $(CFLAGS) -o $(TPROG1) $(P1) $(OLIB) $(ZLIB)
+$(TPROG1): $(P1) $(OLIB)
+	$(CC) $(CFLAGS) -o $(TPROG1) $(P1) $(OLIB)
+
+$(TPROG2): $(P2) $(OLIB)
+	$(CC) $(CFLAGS) -o $(TPROG2) $(P2) $(OLIB) $(IRTCLLIB) \
+		$(ZLIB) $(MOSILIB) $(TCLLIB) $(ELIB) 
+
+$(TPROG3): $(P3) $(OLIB)
+	$(CC) $(CFLAGS) -o $(TPROG3) $(P3) $(OLIB) $(ELIB)
 
-$(TPROG2): $(P2)
-	$(CC) $(CFLAGS) -o $(TPROG2) $(P2) $(OLIB) $(LIBIRTCL) \
-		$(NETLIB) $(TCLLIB) -lm
 
-$(TPROG3): $(P3)
-	$(CC) $(CFLAGS) -o $(TPROG3) $(P3) $(OLIB) $(ZLIB)
+WAISDIR=../../freeWAIS-sf-2.0
+WAISLIB=$(IRTCLDIR)/wais-tcl.o $(WAISDIR)/ir/libwais.a
 
-install: install.prog install.script
+$(TPROG4): $(P4) $(OLIB)
+	$(CC) $(CFLAGS) -o $(TPROG4) $(P4) \
+		$(OLIB) $(IRTCLLIB) \
+		$(WAISLIB) $(ZLIB) $(MOSILIB) $(TCLLIB) $(ELIB) 
 
-install.prog: $(TPROG1) $(TPROG2)
-	@for x in $(TPROG1) $(TPROG2); do \
+install: install.prog install.script install.gif
+
+install.prog: 
+	@if [ ! -d $(CGIDIR) ]; then \
+		echo "Making directory $(CGIDIR)"; \
+		mkdir $(CGIDIR); \
+	fi        
+	@if [ ! -d $(EGWDIR) ]; then \
+		echo "Making directory $(EGWDIR)"; \
+		mkdir $(EGWDIR); \
+	fi        
+	@for x in $(TPROG1); do \
 		echo Installing $$x; \
 		cp $$x $(CGIDIR); \
 		chmod a+x $(CGIDIR)/$$x; \
 	done; \
+	for x in $(TPROG2); do \
+		echo Installing $$x; \
+		cp $$x $(EGWDIR); \
+		chmod a+x $(EGWDIR)/$$x; \
+	done; \
 	for p in egwtcl egwirtcl egwhtml; do \
-		rm -f $(CGIDIR)/$$p; \
-		ln $(CGIDIR)/$(TPROG2) $(CGIDIR)/$$p; \
+		rm -f $(EGWDIR)/$$p; \
+		ln $(EGWDIR)/$(TPROG2) $(EGWDIR)/$$p; \
 	done
+	@if [ -x $(TPROG4) ]; then \
+		echo Installing $(TPROG4); \
+		cp $(TPROG4) $(EGWDIR)/$(TPROG4); \
+		chmod a+x $(EGWDIR)/$(TPROG4); \
+	fi
 
 install.script:
 	@if [ ! -d $(EGWDIR) ]; then \
 		echo "Making directory $(EGWDIR)"; \
 		mkdir $(EGWDIR); \
 	fi        
-	@for x in $(WSCRIPTS); do \
+	@if [ ! -d $(HTDOCS) ]; then \
+		echo "Making directory $(HTDOCS)"; \
+		mkdir $(HTDOCS); \
+	fi        
+	@for x in *.egw *.tcl; do \
 		echo Installing $$x; \
 		cp $$x $(EGWDIR)/$$x; \
 	done
@@ -88,6 +119,8 @@ install.script:
 		echo Installing $$x; \
 		cp $$x $(EGWDIR); \
 	done
+
+install.gif:
 	@if [ ! -d $(GIFDIR) ]; then \
 		echo "Making directory $(GIFDIR)"; \
 		mkdir $(GIFDIR); \