More work on presentation formats.

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

diff --git a/Makefile.in b/Makefile.in
index 7a3b724..9a14647 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.19 1995-10-12 14:46:52 adam Exp $
 SHELL=/bin/sh
 
 # IrTcl Version
-VERSION=1.0
+VERSION=1.0b3
 
 # Directory prefix with machine independent files (scripts, setup files, etc.)
 prefix = @prefix@
@@ -17,19 +17,23 @@ 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=@XLIB@ -lX11
-XINCLUDE=@XINCLUDE@
+XLIB=@XLIBSW@
+XINCLUDE=@XINCLUDES@
 
-# Tcl/Tk libraries
+# Tcl/Tk libraries and include files
 TCLLIB=@TCLLIB@
 TKLIB=@TKLIB@
+TCLINCLUDE=@TCLINCLUDE@
 
 # MOSI directory with libmosi.a and source
 MOSILIB=@MOSILIB@
@@ -38,7 +42,7 @@ MOSILIB=@MOSILIB@
 YAZLIB=$(YAZDIR)/lib/libyaz.a $(MOSILIB) $(YAZDIR)/lib/libutil.a
 
 # All include paths
-INCLUDE=-I$(YAZDIR)/include $(XINCLUDE) -I$(MOSIDIR) -I/usr/local/include
+INCLUDE=-I$(YAZDIR)/include $(XINCLUDE) -I$(MOSIDIR) $(TCLINCLUDE)
 
 # All command line options except CFLAGS
 DEFS=-DCCL2RPN=0 @DEFS@ -DMOSI=@MOSI@ -DIRTCLDIR=\"$(IRTCLDIR)\" \
@@ -49,41 +53,68 @@ 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
 
-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
-       for d in $(IRTCLDIR) $(IRTCLDIR)/formats $(IRTCLDIR)/bitmaps; do \
+install: 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;
-       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
+       @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; \
+               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"; \
+               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
@@ -93,8 +124,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