More work on output queue. Memory related routines moved

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

diff --git a/Makefile.in b/Makefile.in
index 5aacd02..5a66b25 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.6 1995-06-25 10:24:59 adam Exp $
+# $Id: Makefile.in,v 1.15 1995-08-04 11:32:36 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@
@@ -24,6 +24,8 @@ YAZDIR=@YAZDIR@
 MOSIDIR=@MOSIDIR@
 LIBS=@LIBS@ -lm
 
+CC=@CC@
+
 # X11 libraries and include file paths
 XLIB=@XLIBSW@
 XINCLUDE=@XINCLUDES@
@@ -50,12 +52,12 @@ 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
 
 all: ir-tk ir-tcl
 
-ir-tk: libirtcl.a tkmain.o
-       $(CC) $(CFLAGS) tkmain.o -o ir-tk libirtcl.a $(YAZLIB) $(TKLIB) \
+ir-tk: libirtcl.a tkinit.o
+       $(CC) $(CFLAGS) tkinit.o -o ir-tk libirtcl.a $(YAZLIB) $(TKLIB) \
        $(TCLLIB) $(XLIB) $(LIBS)
 
 ir-tcl: libirtcl.a tclmain.o
@@ -67,22 +69,43 @@ libirtcl.a: $(O)
        $(RANLIB) libirtcl.a
 
 install: ir-tcl
-       for d in $(IRTCLDIR) $(IRTCLDIR)/formats $(IRTCLDIR)/bitmaps; do \
+       @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)
-       $(INSTALL_DATA) libirtcl.a $(LIBDIR)
-       $(INSTALL_DATA) ir-tcl.h $(INCDIR)
-       $(INSTALL_DATA) LICENSE clientrc.tcl $(IRTCLDIR)
-       sed "s,^set libdir LIBDIR,set libdir $(IRTCLDIR)," <client.tcl >client.bak
-       if [ -f ir-tk ]; then $(INSTALL_PROGRAM) ir-tk $(BINDIR)
-       $(INSTALL_DATA) client.bak $(IRTCLDIR)/client.tcl
-       $(INSTALL_DATA) formats/*.tcl $(IRTCLDIR)/formats
-       $(INSTALL_DATA) bitmaps/book? $(IRTCLDIR)/bitmaps
+       @echo "Installing ir-tcl"
+       @$(INSTALL_PROGRAM) ir-tcl $(BINDIR)
+       @echo "Installing libirtcl.a"
+       @$(INSTALL_DATA) libirtcl.a $(LIBDIR)
+       @echo "Installing ir-tcl.h"
+       @$(INSTALL_DATA) ir-tcl.h $(INCDIR)
+       @if [ -f ir-tk ]; then \
+               echo "Installing ir-tk"; \
+               $(INSTALL_PROGRAM) ir-tk $(BINDIR); \
+               echo "Installing irclient"; \
+               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); \
+               echo "Installing LICENSE" ; \
+               $(INSTALL_DATA) LICENSE $(IRTCLDIR); \
+               echo "Installing display format scripts"; \
+               for b in formats/*.tcl; do \
+                       if [ -f $$b ]; then \
+                               $(INSTALL_DATA) $$b $(IRTCLDIR)/formats; \
+                       fi; \
+               done; \
+               echo "Installing bitmaps"; \
+               for b in bitmaps/*; do \
+                       if [ -f $$b ]; then \
+                               $(INSTALL_DATA) $$b $(IRTCLDIR)/bitmaps; \
+                       fi; \
+               done; \
+       fi; 
 
 clean:
        rm -f *.[oa] ir-tk ir-tcl core gmon.out mon.out *.bak config.cache
@@ -108,5 +131,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