X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2FMakefile;h=b522a0844265656433359093e2e962f7d4fe8f8d;hb=b443634fbd412cea15ea527188c3e241bb1edf21;hp=ae58bd17ed6dfb00b232f59219256e38b017768d;hpb=c1c09b4242df9a16cd11477deea2e35f8ff57fec;p=egate.git

diff --git a/www/Makefile b/www/Makefile
index ae58bd1..b522a08 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2,7 +2,30 @@
 # Europagate, 1995
 #
 # $Log: Makefile,v $
-# Revision 1.6  1995/10/27 17:30:15  adam
+# 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
@@ -23,15 +46,18 @@
 # First version of www gateway.
 #
 SHELL=/bin/sh
-INCLUDE=-I../include
 #
-MOSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a
-LIBIRTCL=/usr/local/lib/libirtcl.a ../../yaz/lib/libyaz.a $(MOSILIB)
+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)
 #
-#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
@@ -42,7 +68,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
@@ -56,7 +84,8 @@ $(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)
@@ -69,9 +98,10 @@ install.prog: $(TPROG1) $(TPROG2)
 		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 \