X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=Makefile.in;h=a223cf18863372c2867a5dbc9160b0730893feaa;hb=ed273813014dcec37eec2eaf4ea84b61d2232d0c;hp=cb6ec040ba55c7176c019dc738a5e84bf339654d;hpb=b2533c77b911a4f22e273568803da6c8387f8d55;p=ir-tcl-moved-to-github.git

diff --git a/Makefile.in b/Makefile.in
index cb6ec04..a223cf1 100644
--- 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.23 1996-01-11 11:40:02 adam Exp $
+# $Id: Makefile.in,v 1.33 1996-03-27 17:00:08 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,19 +21,17 @@ INCDIR=$(prefix)/include
 IRTCLDIR=$(prefix)/lib/irtcl
 
 YAZDIR=@YAZDIR@
-LIBS=@LIBS@ -lm
 
 CC=@CC@
 
-# X11 libraries and include file paths
-XLIB=@XLIBSW@
-XINCLUDE=@XINCLUDES@
-
-# Tcl/Tk libraries and include files
+# Tcl libraries and include files
 TCLLIB=@TCLLIB@
-TKLIB=@TKLIB@
 TCLINCLUDE=@TCLINCLUDE@
 
+# Tk & X11 libraries and include files
+TKLIB=@TKLIB@
+TKINCLUDE=@TKINCLUDE@
+
 # MOSI settings, directory with libmosi.a and source
 MOSI=@MOSI@
 MOSIDIR=@MOSIDIR@
@@ -44,7 +42,7 @@ MOSIINC=@MOSIINC@
 YAZLIB=$(YAZDIR)/lib/libyaz.a $(MOSILIB)
 
 # All include paths
-INCLUDE=-I$(YAZDIR)/include $(XINCLUDE) $(TCLINCLUDE) $(MOSIINC)
+INCLUDE=-I. -I$(YAZDIR)/include $(TKINCLUDE) $(TCLINCLUDE) $(MOSIINC)
 
 # All command line options except CFLAGS
 DEFS=-DCCL2RPN=0 @DEFS@ -DMOSI=$(MOSI) -DIRTCLDIR=\"$(IRTCLDIR)\" \
@@ -57,14 +55,25 @@ RANLIB = @RANLIB@
 
 O=ir-tcl.o marc.o queue.o mem.o grs.o
 
-all: ir-tk ir-tcl
+all: ir-tcl ir-tk
 
 ir-tk: libirtcl.a tkinit.o
-	$(CC) $(CFLAGS) tkinit.o -o ir-tk libirtcl.a $(YAZLIB) $(TKLIB) \
-	$(TCLLIB) $(XLIB) $(LIBS)
+	$(CC) $(CFLAGS) tkinit.o -o ir-tk libirtcl.a $(YAZLIB) $(TKLIB) 
 
 ir-tcl: libirtcl.a tclmain.o
-	$(CC) $(CFLAGS) tclmain.o -o ir-tcl libirtcl.a $(YAZLIB) $(TCLLIB) $(LIBS)
+	$(CC) $(CFLAGS) tclmain.o -o ir-tcl libirtcl.a $(YAZLIB) $(TCLLIB) 
+
+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)  $(WAISDIR)/ir/libwais.a $(TCLLIB)
+
+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
@@ -119,7 +128,7 @@ install: ir-tcl
 	fi; 
 
 clean:
-	rm -f *.[oa] ir-tk ir-tcl core gmon.out mon.out *.bak config.cache
+	rm -f *.[oa] ir-tk ir-tcl wais-tcl core gmon.out mon.out *.bak config.cache
 
 autoconf:
 	-rm config.cache
@@ -134,19 +143,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 ir-tcl.txt
-	mv tmp/ir-tcl/doc/ir-tcl.ps .; gzip ir-tcl.ps
-	cd tmp/ir-tcl; mkdir irtcl; cp doc/*.html irtcl
+	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