From b8ec5181d306d1fb3654108f0df41280b7047ab3 Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Wed, 18 Oct 2006 11:57:46 +0000
Subject: More tweakings to adapt to TEA 3.

---
 Makefile.in | 286 ++++++++++++------------------------------------------------
 1 file changed, 54 insertions(+), 232 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index f42f8b9..8ff58e3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,25 +28,7 @@ PKG_HEADERS       = @PKG_HEADERS@
 PKG_LIB_FILE      = @PKG_LIB_FILE@
 PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
 
-#========================================================================
-# RUNTIME_SOURCES identifies Tcl runtime files that are associated with
-# this package that need to be installed, if any.
-#========================================================================
-
-RUNTIME_SOURCES = zincLogo.tcl zincText.tcl zincGraphics.tcl
-
-#========================================================================
-# This is a list of header files to be installed
-#========================================================================
-
-GENERIC_HDRS	=
-
-#========================================================================
-# Nothing in the variables below this line need to be changed.
-#========================================================================
-
-lib_BINARIES	= $(PKG_LIB_FILE)
-BINARIES	= $(lib_BINARIES)
+BINARIES	= $(PKG_LIB_FILE) $(PKG_STUB_LIB_FILE)
 
 SHELL		= @SHELL@
 
@@ -54,26 +36,16 @@ srcdir		= @srcdir@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 
-bindir		= @bindir@
 libdir		= @libdir@
-datadir		= @datadir@
-mandir		= @mandir@
 includedir	= @includedir@
 
 DESTDIR		=
 
 PKG_DIR		= $(PACKAGE_NAME)$(PACKAGE_VERSION)
-pkgdatadir	= $(datadir)/$(PKG_DIR)
 pkglibdir	= $(libdir)/$(PKG_DIR)
-pkgincludedir	= $(includedir)/$(PKG_DIR)
 
 top_builddir	= .
 
-generic_dir	= $(srcdir)/generic
-unix_dir	= $(srcdir)/unix
-windows_dir	= $(srcdir)/win
-macosx_dir	= $(srcdir)/macosx
-
 INSTALL		= @INSTALL@
 INSTALL_PROGRAM	= @INSTALL_PROGRAM@
 INSTALL_DATA	= @INSTALL_DATA@
@@ -87,6 +59,7 @@ CFLAGS_WARNING	= @CFLAGS_WARNING@
 CLEANFILES	= @CLEANFILES@
 EXEEXT		= @EXEEXT@
 MAKE_LIB	= @MAKE_LIB@
+MAKE_STUB_LIB	= @MAKE_STUB_LIB@
 MAKE_SHARED_LIB	= @MAKE_SHARED_LIB@
 MAKE_STATIC_LIB	= @MAKE_STATIC_LIB@
 OBJEXT		= @OBJEXT@
@@ -142,40 +115,26 @@ DEFS		= @DEFS@ $(TCL_EXTRA_CFLAGS)
 CONFIG_CLEAN_FILES = Makefile
 
 CPPFLAGS	= @CPPFLAGS@
-LIBS		= @LIBS@
-AR		= ar
+LIBS		= @PKG_LIBS@ @LIBS@
+AR		= @AR@
 CFLAGS		= @CFLAGS@
 COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 
-#========================================================================
-# Start of user-definable TARGETS section
-#========================================================================
-
-#========================================================================
-# TEA TARGETS.  Please note that the "libraries:" target refers to platform
-# independent files, and the "binaries:" target inclues executable programs and
-# platform-dependent libraries.  Modify these targets so that they install
-# the various pieces of your package.  The make and install rules
-# for the BINARIES that you specified above have already been done.
-#========================================================================
 
-all: binaries libraries doc
+#
+# No stubs build right now
+#all: package libraries
+all: package
 
-#========================================================================
-# The binaries target builds executable programs, Windows .dll's, unix
-# shared/static libraries, and any other platform-dependent files.
-# The list of targets to build for "binaries:" is specified at the top
-# of the Makefile, in the "BINARIES" variable.
-#========================================================================
+package: $(PKG_LIB_FILE) pkgIndex.tcl
 
-binaries: $(BINARIES) pkgIndex.tcl
+libraries: $(PKG_STUB_LIB_FILE)
 
-libraries:
 
 #========================================================================
 # The doc target is for building man pages. Currently the zinc doc is
 # only available in html and pdf formats. These formats require tools
-# (LaTeX, pdfTeX, LaTeX2html) that are not readily available on all
+# (LaTeX, pdfTeX, h4tex) that are not readily available on all
 # platforms. To ease automatic construction of the package the target
 # doc does not involve the construction of pdf and html.
 #========================================================================
@@ -207,77 +166,60 @@ html: doc-clean doc/refman.tex
 		tex4ht refman.tex; \
 		t4ht refman.tex)
 
-install: all install-binaries install-libraries install-demos install-doc
-
-install-binaries: binaries install-lib-binaries install-bin-binaries
-
-
-#========================================================================
-# This rule installs platform-independent files, such as header files.
-#========================================================================
+#
+# No stubs and no headers installed right now
+#install: install-package install-libraries install-headers install-demos
+install: install-package install-demos
 
-install-libraries: libraries
-	@if test "x$(GENERIC_HDRS)" != "x"; then \
-	  mkdir -p $(DESTDIR)$(includedir); \
-	  echo "Installing header files in $(DESTDIR)$(includedir)"; \
-	  for i in "$(GENERIC_HDRS)" ; do \
-	    echo "Installing $$i" ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
-	  done; \
-	fi
+install-package:
+	@mkdir -p $(DESTDIR)$(pkglibdir)
+	$(INSTALL_PROGRAM) $(PKG_LIB_FILE) $(DESTDIR)$(pkglibdir)/$(PKG_LIB_FILE)
+	for p in $(srcdir)/library/*.tcl ; do \
+		destp=`basename $$p`; \
+		echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \
+		$(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir)/$$destp; \
+	done
+	cat pkgIndex.tcl >> $(DESTDIR)$(pkglibdir)/pkgIndex.tcl
+
+install-headers:
+	echo "Installing header files in $(DESTDIR)$(includedir)"; \
+	mkdir -p $(DESTDIR)$(includedir); \
+	for i in "$(PKG_HEADERS)" ; do \
+		echo "Install $(srcdir)/$$i" ; \
+		destp=`basename $$i`; \
+		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/$$destp ; \
+	done
 
-#========================================================================
-# This rule installs the demos files and associated images.
-#========================================================================
+install-libraries:
+	@echo "Installing $(PKG_STUB_LIB_FILE) in $(DESTDIR)$(libdir)"
+	@mkdir -p $(DESTDIR)$(libdir)
+	$(INSTALL_PROGRAM) $(PKG_STUB_LIB_FILE) $(DESTDIR)$(libdir)
 
 install-demos:
 	@mkdir -p $(DESTDIR)$(pkglibdir)/demos
 	@echo "Installing demo files in $(DESTDIR)$(pkglibdir)/demos"
 	@for p in $(srcdir)/demos/*; do \
-	  if test -f $$p; then \
-	    p=`basename $$p`; \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/demos/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/demos/$$p $(DESTDIR)$(pkglibdir)/demos/$$p; \
-	  fi; \
+		p=`basename $$p`; \
+		echo " Install $$p $(DESTDIR)$(pkglibdir)/demos/$$p"; \
+		$(INSTALL_DATA) $(srcdir)/demos/$$p $(DESTDIR)$(pkglibdir)/demos/$$p; \
 	done
 	@mkdir -p $(DESTDIR)$(pkglibdir)/demos/images
 	@mkdir -p $(DESTDIR)$(pkglibdir)/demos/data
 	@for p in $(srcdir)/demos/images/*; do \
-	  if test -f $$p; then \
-	    p=`basename $$p`; \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/demos/images/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/demos/images/$$p $(DESTDIR)$(pkglibdir)/demos/images/$$p; \
-	  fi; \
+		p=`basename $$p`; \
+		echo " Install $$p $(DESTDIR)$(pkglibdir)/demos/images/$$p"; \
+		$(INSTALL_DATA) $(srcdir)/demos/images/$$p $(DESTDIR)$(pkglibdir)/demos/images/$$p; \
 	done
 	@for p in $(srcdir)/demos/data/*; do \
-	  if test -f $$p; then \
-	    p=`basename $$p`; \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/demos/data/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/demos/data/$$p $(DESTDIR)$(pkglibdir)/demos/data/$$p; \
-	  fi; \
-	done
-
-#========================================================================
-# Install documentation.  Unix manpages should go in the $(mandir)
-# directory.
-#========================================================================
-
-install-doc: doc
-	@mkdir -p $(DESTDIR)$(mandir)/mann
-	@echo "Installing documentation in $(DESTDIR)$(mandir)"
-	@for i in $(srcdir)/doc/*.n; do \
-	  if test -f $$i; then \
-	    i=`basename $$i`; \
-	    echo "Installing $$i"; \
-	    rm -f $(DESTDIR)$(mandir)/mann/$$i; \
-	    $(INSTALL_DATA) $(srcdir)/doc/$$i $(DESTDIR)$(mandir)/mann/$$i ; \
-	  fi \
+		p=`basename $$p`; \
+		echo " Install $$p $(DESTDIR)$(pkglibdir)/demos/data/$$p"; \
+		$(INSTALL_DATA) $(srcdir)/demos/data/$$p $(DESTDIR)$(pkglibdir)/demos/data/$$p; \
 	done
 
-test: binaries libraries
+test: package libraries
 	$(TCLSH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) ; \
 
-shell: binaries libraries
+shell: package libraries
 	@$(TCLSH) $(SCRIPT)
 
 gdb:
@@ -285,26 +227,15 @@ gdb:
 
 depend:
 
-
-#========================================================================
-# $($(PACKAGE)_LIB_FILE) should be listed as part of the BINARIES variable
-# mentioned above.  That will ensure that this target is built when you
-# run "make binaries".
-#
-# The $($(PACKAGE)_OBJECTS) objects are created and linked into the final
-# library.  In most cases these object files will correspond to the
-# source files above.
-#========================================================================
-
 $(PKG_LIB_FILE): $(PKG_OBJECTS)
-	-rm -f $($(PKG_LIB_FILE)
+	-rm -f $(PKG_LIB_FILE)
 	${MAKE_LIB}
-	#$(RANLIB) $(PKG_LIB_FILE)
+	$(RANLIB) $(PKG_LIB_FILE)
 
 $(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS)
-	-rm -f $($(PKG_STUB_LIB_FILE)
+	-rm -f $(PKG_STUB_LIB_FILE)
 	${MAKE_STUB_LIB}
-	#$(RANLIB) $(PKG_STUB_LIB_FILE)
+	$(RANLIB) $(PKG_STUB_LIB_FILE)
   
 #========================================================================
 # We need to enumerate the list of .c to .o lines here.
@@ -321,7 +252,7 @@ $(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS)
 # As necessary, add $(srcdir):$(srcdir)/compat:....
 #========================================================================
 
-VPATH = $(srcdir):$(generic_dir):$(unix_dir):$(windows_dir):$(macosx_dir)
+VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win:$(srcdir)/macosx
 
 .SUFFIXES: .c .$(OBJEXT)
 
@@ -342,48 +273,6 @@ pkgIndex.tcl:
 	) > pkgIndex.tcl
 
 #========================================================================
-# Distribution creation
-# You may need to tweak this target to make it work correctly.
-#========================================================================
-
-COMPRESS	= tar zcvf $(PKG_DIR).tar.gz $(PKG_DIR)
-DIST_ROOT	= /tmp/dist
-DIST_DIR	= $(DIST_ROOT)/$(PKG_DIR)
-
-dist-clean:
-	rm -rf $(DIST_DIR) $(DIST_ROOT)/$(PKG_DIR).tar.*
-
-dist: dist-clean
-	mkdir -p $(DIST_DIR)
-	cp -p $(srcdir)/BUGS $(srcdir)/README* $(srcdir)/Copyright* \
-		$(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/*.in \
-		$(DIST_DIR)/
-	chmod 664 $(DIST_DIR)/Makefile.in $(DIST_DIR)/aclocal.m4
-	chmod 775 $(DIST_DIR)/configure $(DIST_DIR)/configure.in
-
-	-cp -p $(srcdir)/*.[ch] $(DIST_DIR)/
-
-	mkdir $(DIST_DIR)/tclconfig
-	cp $(srcdir)/tclconfig/install-sh $(srcdir)/tclconfig/tcl.m4 \
-		$(DIST_DIR)/tclconfig/
-	chmod 664 $(DIST_DIR)/tclconfig/tcl.m4
-	chmod +x $(DIST_DIR)/tclconfig/install-sh
-
-	-list='demos doc generic debian redhat library mac tests unix win Perl Python'; \
-	for p in $$list; do \
-	    if test -d $(srcdir)/$$p ; then \
-		tar cf - --exclude=CVS --exclude=.cvsignore $$p | \
-	        (cd $(DIST_DIR); tar xf -) \
-	    fi; \
-	done
-
-	(cd $(DIST_ROOT); $(COMPRESS);)
-
-#========================================================================
-# End of user-definable section
-#========================================================================
-
-#========================================================================
 # Don't modify the file to clean here.  Instead, set the "CLEANFILES"
 # variable in configure.in
 #========================================================================
@@ -409,78 +298,11 @@ distclean: clean
 # You should not have to modify this target.
 #========================================================================
 
-install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
-	@list='$(lib_BINARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-	    echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
-	    ext=`echo $$p|sed -e "s/.*\.//"`; \
-	    if test "x$$ext" = "xdll"; then \
-		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
-		if test -f $$lib; then \
-		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
-	            $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
-		fi; \
-	    fi; \
-	  fi; \
-	done
-	@list='$(aux_BINARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " Install $$p $(DESTDIR)$(libdir)/$$p"; \
-	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
-	  fi; \
-	done
-	@list='$(RUNTIME_SOURCES)'; for p in $$list; do \
-	  if test -f $(srcdir)/library/$$p; then \
-	    echo " Install $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/library/$$p $(DESTDIR)$(pkglibdir)/$$p; \
-	  fi; \
-	done
-#
-# Construct a full pkgIndex in the installation directory
-	(cd $(DESTDIR)$(pkglibdir); \
-	  (echo package require Tk \; pkg_mkIndex -load Tk . \
-		$(RUNTIME_SOURCES) $($(PACKAGE)_LIB_FILE) \; exit;) | $(WISH))
-
-#========================================================================
-# Install binary executables (e.g. .exe files and dependent .dll files)
-# This is for files that must go in the bin directory (located next to
-# wish and tclsh), like dependent .dll files on Windows.
-#
-# You should not have to modify this target, except to define bin_BINARIES
-# above if necessary.
-#========================================================================
-
-install-bin-binaries:
-	@mkdir -p $(DESTDIR)$(bindir)
-	@list='$(bin_BINARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p"; \
-	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p; \
-	  fi; \
-	done
-
-.SUFFIXES: .c .$(OBJEXT)
-
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-uninstall-binaries:
-	list='$(lib_BINARIES)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-	done
-	list='$(RUNTIME_SOURCES)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-	done
-	list='$(bin_BINARIES)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(bindir)/$$p; \
-	done
-
-.PHONY: all binaries clean depend distclean doc install libraries test
+.PHONY: all package clean depend distclean doc install libraries test
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
-- 
cgit v1.1