Lots of changes. They aren't visible though.

[egate.git] / www / Makefile

diff --git a/www/Makefile b/www/Makefile
index f737871..000302e 100644 (file)
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,31 +1,35 @@
 # Makefile for www gateway utility
 # Europagate, 1995
 #
-# $Id: Makefile,v 1.24 1996/01/24 10:13:56 adam Exp $
+# $Id: Makefile,v 1.34 1996/03/07 12:46:07 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)
+
+IRTCLDIR=../../ir-tcl
+IRTCLLIB=$(IRTCLDIR)/libirtcl.a
+IRTCLINC=-I$(IRTCLDIR)
+
+#MOSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a
 #NETLIB=-lnsl -lsocket
-#
+
 OLIB=../lib/util.a ../lib/libres+log.a 
-TCLLIB=/usr/local/lib/libtcl7.4.a
-TCLINC=-I/usr/local/include
-#
+TCLLIB=/usr/local/lib/libtcl7.5.a
+TCLINC=
+
 WSCRIPTS=egwscript targets.egw query.egw search.egw showfull.egw z39util.tcl \
- mtargets.egw mquery.egw msearch.egw history.egw
+ mtargets.egw mquery.egw msearch.egw history.egw tform.egw tdefine.egw sameas.egw
 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
@@ -42,40 +46,70 @@ GIFDIR=$(HTDOCS)/egwgif
 #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 $(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) $(NETLIB) $(TCLLIB) -lm
+
+$(TPROG3): $(P3) $(OLIB)
+       $(CC) $(CFLAGS) -o $(TPROG3) $(P3) $(OLIB)
+
 
-$(TPROG2): $(P2)
-       $(CC) $(CFLAGS) -o $(TPROG2) $(P2) $(OLIB) $(LIBIRTCL) \
-               $(NETLIB) $(TCLLIB) -lm
+WAISDIR=../../freeWAIS-sf-2.0
+WAISLIB=$(IRTCLDIR)/wais-tcl.o $(WAISDIR)/ir/libwais.a
 
-$(TPROG3): $(P3)
-       $(CC) $(CFLAGS) -o $(TPROG3) $(P3) $(OLIB) $(ZLIB)
+$(TPROG4): $(P4) $(OLIB)
+       $(CC) $(CFLAGS) -o $(TPROG4) $(P4) \
+               $(OLIB) $(IRTCLLIB) \
+               $(WAISLIB) $(ZLIB) $(MOSILIB) $(NETLIB) $(TCLLIB) -lm
 
-install: install.prog install.script
+install: install.prog install.script install.gif
 
 install.prog: $(TPROG1) $(TPROG2)
-       @for x in $(TPROG1) $(TPROG2); do \
+       @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        
+       @if [ ! -d $(HTDOCS) ]; then \
+               echo "Making directory $(HTDOCS)"; \
+               mkdir $(HTDOCS); \
+       fi        
        @for x in $(WSCRIPTS); do \
                echo Installing $$x; \
                cp $$x $(EGWDIR)/$$x; \
@@ -88,6 +122,8 @@ install.script:
                echo Installing $$x; \
                cp $$x $(EGWDIR); \
        done
+
+install.gif:
        @if [ ! -d $(GIFDIR) ]; then \
                echo "Making directory $(GIFDIR)"; \
                mkdir $(GIFDIR); \