X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2FMakefile;h=4c97ecb7a8ab78f5c4868881fab880519f42cecf;hb=6c6f3deb01675917b3c73cca50dd20d738593a47;hp=e2efd2b062c022e1e08566644ddca3c03abeb6c0;hpb=a6f3beb071fe8c894ee6c846c86296c84f48e3d4;p=egate.git

diff --git a/www/Makefile b/www/Makefile
index e2efd2b..4c97ecb 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2,7 +2,44 @@
 # Europagate, 1995
 #
 # $Log: Makefile,v $
-# Revision 1.5  1995/10/27 15:12:02  adam
+# Revision 1.15  1995/11/13 18:17:46  adam
+# Better error handling.
+#
+# Revision 1.14  1995/11/13  15:41:40  adam
+# Arrow gifs.
+# Gateway uses record element set names B(rief) and F(ull).
+# Bug fix. Didn't save idAuthentication correctly.
+#
+# 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.
@@ -20,18 +57,21 @@
 # First version of www gateway.
 #
 SHELL=/bin/sh
-INCLUDE=-I../include
 #
+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 ../../yaz/lib/libyaz.a $(MOSILIB)
+LIBIRTCL=/usr/local/lib/libirtcl.a $(ZLIB) $(MOSILIB)
 #
-#CFLAGS=-g -Wall -pedantic -ansi
-OLIB=../lib/libres+log.a
+OLIB=../lib/util.a ../lib/libres+log.a 
 TCLLIB=/usr/local/lib/libtcl7.4.a
-WSCRIPTS=egwscript targets.egw query.egw search.egw
+#
+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
+GIFFILES=webgate.gif darrw.gif uarrw.gif noway.gif
 TPROG1=egwcgi
 TPROG2=egwsh
 TPROG3=wtest
@@ -39,7 +79,9 @@ P1=wcgi.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
@@ -53,20 +95,26 @@ $(TPROG1): $(P1)
 	$(CC) $(CFLAGS) -o $(TPROG1) $(P1) $(OLIB)
 
 $(TPROG2): $(P2)
-	$(CC) $(CFLAGS) -o $(TPROG2) $(P2) $(OLIB) $(LIBIRTCL) $(TCLLIB) -lm
+	$(CC) $(CFLAGS) -o $(TPROG2) $(P2) $(OLIB) $(LIBIRTCL) \
+		$(NETLIB) $(TCLLIB) -lm
 
 $(TPROG3): $(P3)
 	$(CC) $(CFLAGS) -o $(TPROG3) $(P3) $(OLIB)
 
-install: $(TPROG1) $(TPROG2)
+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; \
-	ln -f $(CGIBIN)/$(TPROG2) $(CGIBIN)/egwtcl; \
-	ln -f $(CGIBIN)/$(TPROG2) $(CGIBIN)/egwirtcl; \
-	ln -f $(CGIBIN)/$(TPROG2) $(CGIBIN)/egwhtml
+	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); \