Better error handling. WAIS target closed before failback is invoked.

[ir-tcl-moved-to-github.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index e231b49..4ca4821 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,11 +2,11 @@
 # (c) Index Data 1995
 # See the file LICENSE for details.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.20 1995-11-28 17:26:35 adam Exp $
+# $Id: Makefile.in,v 1.30 1996-02-29 15:30:19 adam Exp $
 SHELL=/bin/sh
 
 # IrTcl Version
-VERSION=1.0
+VERSION=1.1
 
 # Directory prefix with machine independent files (scripts, setup files, etc.)
 prefix = @prefix@
@@ -21,7 +21,6 @@ INCDIR=$(prefix)/include
 IRTCLDIR=$(prefix)/lib/irtcl
 
 YAZDIR=@YAZDIR@
-MOSIDIR=@MOSIDIR@
 LIBS=@LIBS@ -lm
 
 CC=@CC@
@@ -35,17 +34,20 @@ TCLLIB=@TCLLIB@
 TKLIB=@TKLIB@
 TCLINCLUDE=@TCLINCLUDE@
 
-# MOSI directory with libmosi.a and source
+# MOSI settings, directory with libmosi.a and source
+MOSI=@MOSI@
+MOSIDIR=@MOSIDIR@
 MOSILIB=@MOSILIB@
+MOSIINC=@MOSIINC@
 
 # All YAZ libraries - including MOSI libraries.
-YAZLIB=$(YAZDIR)/lib/libyaz.a $(MOSILIB) $(YAZDIR)/lib/libutil.a
+YAZLIB=$(YAZDIR)/lib/libyaz.a $(MOSILIB)
 
 # All include paths
-INCLUDE=-I$(YAZDIR)/include $(XINCLUDE) -I$(MOSIDIR) $(TCLINCLUDE)
+INCLUDE=-I. -I$(YAZDIR)/include $(XINCLUDE) $(TCLINCLUDE) $(MOSIINC)
 
 # All command line options except CFLAGS
-DEFS=-DCCL2RPN=0 @DEFS@ -DMOSI=@MOSI@ -DIRTCLDIR=\"$(IRTCLDIR)\" \
+DEFS=-DCCL2RPN=0 @DEFS@ -DMOSI=$(MOSI) -DIRTCLDIR=\"$(IRTCLDIR)\" \
        $(INCLUDE) -DIR_TCL_VERSION=\"$(VERSION)\"
 
 INSTALL = @INSTALL@
@@ -64,6 +66,17 @@ ir-tk: libirtcl.a tkinit.o
 ir-tcl: libirtcl.a tclmain.o
        $(CC) $(CFLAGS) tclmain.o -o ir-tcl libirtcl.a $(YAZLIB) $(TCLLIB) $(LIBS)
 
+WAISDIR=../freeWAIS-sf-2.0
+
+wais-tcl: libirtcl.a wais-tcl.o waismain.o
+       $(CC) $(CFLAGS) wais-tcl.o waismain.o -o wais-tcl libirtcl.a $(YAZLIB) $(TCLLIB) $(WAISDIR)/ir/libwais.a $(LIBS)
+
+waismain.o: tclmain.c
+       $(CC) -c $(CFLAGS) -DUSE_WAIS=1 $(DEFS) tclmain.c -o waismain.o
+
+wais-tcl.o: wais-tcl.c
+       $(CC) -c $(CFLAGS) -I$(WAISDIR)/ir $(DEFS) wais-tcl.c
+
 libirtcl.a: $(O)
        rm -f libirtcl.a
        ar qc libirtcl.a $(O)
@@ -132,13 +145,18 @@ distribution:
        fi
        mkdir tmp; cd tmp; cvs export -f -D now ir-tcl
        cp configure tmp/ir-tcl
-       cd tmp/ir-tcl/doc; make all
        cd tmp; mv ir-tcl ir-tcl-$(VERSION)
        cd tmp; tar zcf ../ir-tcl-$(VERSION).tar.gz ir-tcl-$(VERSION)
+       cd tmp; mv ir-tcl-$(VERSION) ir-tcl
+       cd tmp/ir-tcl/doc; make all
+       mv tmp/ir-tcl/doc/ir-tcl.txt .; gzip -f ir-tcl.txt
+       mv tmp/ir-tcl/doc/ir-tcl.ps .; gzip -f ir-tcl.ps
+       cd tmp/ir-tcl; mkdir irtcl; cp doc/*.html CHANGELOG irtcl
+       cd tmp/ir-tcl; tar zcf ../../irtclhtml.tar.gz irtcl
        rm -fr tmp
 
 .c.o:
        $(CC) -c $(CFLAGS) $(DEFS) $<
 
-$(O) tkinit.o tclmain.o: ir-tcl.h ir-tclp.h
+$(O) tkinit.o tclmain.o wais-tcl.o waismain.o: ir-tcl.h ir-tclp.h