X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=Makefile.in;h=f9cb2ca35fd553251ba899d467b97f558f50276f;hb=871eb649def07ab27f6bfc9290fc490653e97a1d;hp=d2a91380da23c59d43ec45d1b299376ae068ddd9;hpb=84667651230fe801a73274c5f95e9f7c8bf0813a;p=ir-tcl-moved-to-github.git

diff --git a/Makefile.in b/Makefile.in
index d2a9138..f9cb2ca 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.13 1995-06-29 14:06:24 adam Exp $
+# $Id: Makefile.in,v 1.34 1996-06-06 10:45:59 adam Exp $
 SHELL=/bin/sh
 
 # IrTcl Version
-VERSION=1.0b2
+VERSION=1.1
 
 # Directory prefix with machine independent files (scripts, setup files, etc.)
 prefix = @prefix@
@@ -21,30 +21,31 @@ INCDIR=$(prefix)/include
 IRTCLDIR=$(prefix)/lib/irtcl
 
 YAZDIR=@YAZDIR@
-MOSIDIR=@MOSIDIR@
-LIBS=@LIBS@ -lm
 
 CC=@CC@
 
-# X11 libraries and include file paths
-XLIB=@XLIBSW@
-XINCLUDE=@XINCLUDES@
-
-# Tcl/Tk libraries
+# Tcl libraries and include files
 TCLLIB=@TCLLIB@
+TCLINC=@TCLINC@
+
+# Tk & X11 libraries and include files
 TKLIB=@TKLIB@
+TKINC=@TKINC@
 
-# 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) -I/usr/local/include
+INCLUDE=-I. -I$(YAZDIR)/include $(TKINC) $(TCLINC) $(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@
@@ -52,16 +53,27 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 RANLIB = @RANLIB@
 
-O=ir-tcl.o marc.o
+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
@@ -89,8 +101,16 @@ install: ir-tcl
 		echo "#! $(BINDIR)/ir-tk -f" >head.bak; \
 		cat head.bak client.tcl| sed "s,^set libdir LIBDIR,set libdir $(IRTCLDIR)," >client.bak; \
 		$(INSTALL_PROGRAM) client.bak $(BINDIR)/irclient; \
-		echo "Installing clientrc.tcl" ; \
-		$(INSTALL_DATA) clientrc.tcl $(IRTCLDIR); \
+		if [ -f $(IRTCLDIR)/clientrc.tcl ]; then \
+			echo "clientrc.tcl already exists"; \
+			echo "Installing clientrc.tcl.n"; \
+			cp clientrc.tcl clientrc.tcl.n; \
+			$(INSTALL_DATA) clientrc.tcl.n $(IRTCLDIR); \
+			rm clientrc.tcl.n; \
+		else \
+			echo "Installing clientrc.tcl"; \
+			$(INSTALL_DATA) clientrc.tcl $(IRTCLDIR); \
+		fi; \
 		echo "Installing LICENSE" ; \
 		$(INSTALL_DATA) LICENSE $(IRTCLDIR); \
 		echo "Installing display format scripts"; \
@@ -108,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
@@ -123,13 +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 -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