X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=Makefile.in;h=c0218547bda286baa9fcfdb9653b4827734cafad;hb=767a36c6fa25635440469b0f72df7c01456ecaea;hp=b2b16454c66491c1976e76b42bb1ec3cc520b669;hpb=7a1456252a76dea54f0c4204f510b82b6457f3bc;p=ir-tcl-moved-to-github.git

diff --git a/Makefile.in b/Makefile.in
index b2b1645..c021854 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.4 1995-06-22 13:46:52 adam Exp $
+# $Id: Makefile.in,v 1.10 1995-06-26 14:46:24 adam Exp $
 SHELL=/bin/sh
 
 # IrTcl Version
-VERSION=1.0
+VERSION=1.0b2
 
 # Directory prefix with machine independent files (scripts, setup files, etc.)
 prefix = @prefix@
@@ -17,12 +17,15 @@ exec_prefix = @exec_prefix@
 BINDIR=$(exec_prefix)/bin
 LIBDIR=$(exec_prefix)/lib
 MANDIR=$(prefix)/man
+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@
@@ -53,24 +56,19 @@ O=ir-tcl.o marc.o
 
 all: ir-tk ir-tcl
 
-ir-tk: $(O) tkmain.o
-	$(CC) $(CFLAGS) $(O) tkmain.o -o ir-tk $(YAZLIB) $(TKLIB) \
+ir-tk: libirtcl.a tkinit.o
+	$(CC) $(CFLAGS) tkinit.o -o ir-tk libirtcl.a $(YAZLIB) $(TKLIB) \
 	$(TCLLIB) $(XLIB) $(LIBS)
 
-ir-tcl: $(O) tclmain.o
-	$(CC) $(CFLAGS) $(O) tclmain.o -o ir-tcl $(YAZLIB) $(TCLLIB) $(LIBS)
+ir-tcl: libirtcl.a tclmain.o
+	$(CC) $(CFLAGS) tclmain.o -o ir-tcl libirtcl.a $(YAZLIB) $(TCLLIB) $(LIBS)
 
-install-tcl: ir-tcl
-	for d in $(IRTCLDIR) $(IRTCLDIR)/formats $(IRTCLDIR)/bitmaps; do \
-		if [ ! -d $$d ]; then \
-			echo Making $$d; \
-			mkdir $$d; \
-			chmod 755 $$d; \
-		fi; \
-	done;
-	$(INSTALL_PROGRAM) ir-tcl $(BINDIR)
+libirtcl.a: $(O)
+	rm -f libirtcl.a
+	ar qc libirtcl.a $(O)
+	$(RANLIB) libirtcl.a
 
-install-tk: ir-tk
+install: ir-tcl
 	for d in $(IRTCLDIR) $(IRTCLDIR)/formats $(IRTCLDIR)/bitmaps; do \
 		if [ ! -d $$d ]; then \
 			echo Making $$d; \
@@ -78,12 +76,18 @@ install-tk: ir-tk
 			chmod 755 $$d; \
 		fi; \
 	done;
-	sed "s,^set libdir LIBDIR,set libdir $(IRTCLDIR)," <client.tcl >client.bak
-	$(INSTALL_PROGRAM) ir-tk $(BINDIR)
-	$(INSTALL_DATA) client.bak $(IRTCLDIR)/client.tcl
-	$(INSTALL_DATA) LICENSE clientrc.tcl $(IRTCLDIR)
-	$(INSTALL_DATA) formats/*.tcl $(IRTCLDIR)/formats
-	$(INSTALL_DATA) bitmaps/book? $(IRTCLDIR)/bitmaps
+	$(INSTALL_PROGRAM) ir-tcl $(BINDIR)
+	$(INSTALL_DATA) libirtcl.a $(LIBDIR)
+	$(INSTALL_DATA) ir-tcl.h $(INCDIR)
+	if [ -f ir-tk ]; then \
+	        $(INSTALL_PROGRAM) ir-tk $(BINDIR); \
+		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; \
+		$(INSTALL_DATA) LICENSE clientrc.tcl $(IRTCLDIR); \
+		$(INSTALL_DATA) formats/*.tcl $(IRTCLDIR)/formats; \
+		$(INSTALL_DATA) bitmaps/book? $(IRTCLDIR)/bitmaps; \
+	fi; 
 
 clean:
 	rm -f *.[oa] ir-tk ir-tcl core gmon.out mon.out *.bak config.cache
@@ -109,5 +113,5 @@ distribution:
 .c.o:
 	$(CC) -c $(CFLAGS) $(DEFS) $<
 
-$(O) tkmain.o tclmain.o: ir-tcl.h ir-tclp.h
+$(O) tkinit.o tclmain.o: ir-tcl.h ir-tclp.h