X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2FMakefile;h=4274f14d824733a26c9b5594c2990ac7b3e12468;hb=3d4b6045b8875099666b99edbf1457c91b5da928;hp=36772bd7258c36ded537a828622f150ab405717f;hpb=1938b1fd36e774fa9b6d11a4eb5edfcdaee0267b;p=egate.git

diff --git a/www/Makefile b/www/Makefile
index 36772bd..4274f14 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2,42 +2,126 @@
 # Europagate, 1995
 #
 # $Log: Makefile,v $
-# Revision 1.1  1995/10/20 11:49:24  adam
+# Revision 1.13  1995/11/08 18:07:22  adam
+# Minor changes.
+#
+# Revision 1.12  1995/11/08  16:14:32  adam
+# Many improvements and bug fixes.
+# First version that ran on dtbsun.
+#
+# Revision 1.11  1995/11/07  14:56:58  adam
+# Work on search in multiple targets.
+# New wtcl command: wlog.
+# Optional timeout parameter to zwait.
+#
+# Revision 1.10  1995/11/07  10:44:29  adam
+# Work on search in multiple targets.
+#
+# Revision 1.9  1995/11/06  17:44:20  adam
+# State reestablised when shell restarts. History of previous
+# result sets.
+#
+# Revision 1.8  1995/11/06  10:51:14  adam
+# End of response marker in response from wsh/wproto to wcgi.
+# Shells are respawned when necessary.
+#
+# Revision 1.7  1995/10/31  16:56:23  adam
+# Record presentation.
+#
+# Revision 1.6  1995/10/27  17:30:15  adam
+# First search request/response that works.
+#
+# Revision 1.5  1995/10/27  15:12:02  adam
+# IrTcl incorporated in the gateway.
+# Better separation of script types.
+# Z39.50 gateway scripts entered.
+#
+# Revision 1.4  1995/10/23  17:04:16  adam
+# Added some initial z39 gateway scripts.
+#
+# Revision 1.3  1995/10/23  16:55:33  adam
+# A lot of changes - really.
+#
+# Revision 1.2  1995/10/20  14:02:40  adam
+# First version of WWW gateway with embedded Tcl.
+#
+# Revision 1.1  1995/10/20  11:49:24  adam
 # First version of www gateway.
 #
 SHELL=/bin/sh
-INCLUDE=-I../include
-#CFLAGS=-g -Wall -pedantic -ansi
-OLIB=../lib/libres+log.a
+#
+ZDEFS=
+ZINC=-I../../yaz/include
+ZLIB=../../yaz/lib/libyaz.a
+MOSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a
+LIBIRTCL=/usr/local/lib/libirtcl.a $(ZLIB) $(MOSILIB)
+#
+OLIB=../lib/util.a ../lib/libres+log.a 
+TCLLIB=/usr/local/lib/libtcl7.4.a
+#
+WSCRIPTS=egwscript targets.egw query.egw search.egw showfull.egw z39util.tcl \
+ mtargets.egw mquery.egw msearch.egw
+HSCRIPTS=egwindex.html
+CONFFILES=ztargets.conf
+GIFFILES=webgate.gif
 TPROG1=egwcgi
 TPROG2=egwsh
 TPROG3=wtest
 P1=wcgi.o
-P2=wproto.o wsh.o
+P2=wproto.o winterp.o wsh.o wtcl.o whtml.o wirtcl.o
 P3=wproto.o wtest.o
 CPP=$(CC) -E
-DEFS=$(INCLUDE)
+#
+INCLUDE=-I../include $(ZINC)
+DEFS=$(INCLUDE) $(ZDEFS)
 
 HTTPDDIR=/usr/local/etc/httpd
 CGIBIN=$(HTTPDDIR)/cgi-bin
 HTDOCS=$(HTTPDDIR)/htdocs
+CONFDIR=$(HTTPDDIR)/conf
+GIFDIR=$(HTDOCS)/gif
 
-all: $(TPROG1) $(TPROG2) $(TPROG3)
+all: $(TPROG1) $(TPROG2)
 
 $(TPROG1): $(P1)
 	$(CC) $(CFLAGS) -o $(TPROG1) $(P1) $(OLIB)
 
 $(TPROG2): $(P2)
-	$(CC) $(CFLAGS) -o $(TPROG2) $(P2) $(OLIB)
+	$(CC) $(CFLAGS) -o $(TPROG2) $(P2) $(OLIB) $(LIBIRTCL) \
+		$(NETLIB) $(TCLLIB) -lm
 
 $(TPROG3): $(P3)
 	$(CC) $(CFLAGS) -o $(TPROG3) $(P3) $(OLIB)
 
-install: $(TPROG1) $(TPROG2) $(TPROG3)
-	@for x in $(TPROG1) $(TPROG2) $(TPROG3); do \
+install: install.prog install.script
+
+install.prog: $(TPROG1) $(TPROG2)
+	@for x in $(TPROG1) $(TPROG2); do \
 		echo Installing $$x; \
 		cp $$x $(CGIBIN); \
 		chmod +x $(CGIBIN)/$$x; \
+	done; \
+	for p in egwtcl egwirtcl egwhtml; do \
+		rm -f $(CGIBIN)/$$p; \
+		ln $(CGIBIN)/$(TPROG2) $(CGIBIN)/$$p; \
+	done
+
+install.script:
+	@for x in $(WSCRIPTS); do \
+		echo Installing $$x; \
+		cp $$x $(CGIBIN); \
+	done
+	@for x in $(HSCRIPTS); do \
+		echo Installing $$x; \
+		cp $$x $(HTDOCS); \
+	done
+	@for x in $(CONFFILES); do \
+		echo Installing $$x; \
+		cp $$x $(CONFDIR); \
+	done
+	@for x in $(GIFFILES); do \
+		echo Installing $$x; \
+		cp $$x $(GIFDIR); \
 	done
 
 .c.o: