New version.

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

diff --git a/Makefile.in b/Makefile.in
index 7a3b724..a5d550c 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.3 1995-06-22 07:15:57 adam Exp $
+# $Id: Makefile.in,v 1.9 1995-06-26 11:15:26 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,6 +17,7 @@ exec_prefix = @exec_prefix@
 BINDIR=$(exec_prefix)/bin
 LIBDIR=$(exec_prefix)/lib
 MANDIR=$(prefix)/man
+INCDIR=$(prefix)/include
 IRTCLDIR=$(prefix)/lib/irtcl
 
 YAZDIR=@YAZDIR@
@@ -24,8 +25,8 @@ MOSIDIR=@MOSIDIR@
 LIBS=@LIBS@ -lm
 
 # X11 libraries and include file paths
-XLIB=@XLIB@ -lX11
-XINCLUDE=@XINCLUDE@
+XLIB=@XLIBSW@
+XINCLUDE=@XINCLUDES@
 
 # Tcl/Tk libraries
 TCLLIB=@TCLLIB@
@@ -53,24 +54,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 +74,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
@@ -93,8 +95,21 @@ autoconf:
        autoconf
        configure
 
+distribution:
+       echo "Making distribution version $(VERSION). Did you commit?"
+       autoconf
+       if [ -d tmp ]; then \
+               rm -fr tmp; \
+       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)
+       rm -fr tmp
+
 .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