* unix/Makefile.in: Add MAJOR_VERSION, MINOR_VERSION,

	PATCH_LEVEL, INSTALL_LIBRARY, STUB_LIB_FILE, and LIB_FILE
	to support changes in tcl.m4 related to library builds.
	Use MAKE_LIB macro to avoid dealing with RANLIB issues.
	Rename TK_CC_SEARCH_FLAGS to CC_SEARCH_FLAGS and
	rename TK_LD_SEARCH_FLAGS to LD_SEARCH_FLAGS.
	Use new INSTALL_LIB and INSTALL_STUB_LIB substs to
	deal with ranlib issues when install libraries.
	* unix/configure: Regen.
	* unix/configure.in: Remove AC_PROG_RANLIB since
	this is done by tcl.m4 now. Define CC_SEARCH_FLAGS
	instead of TK_CC_SEARCH_FLAGS and so on.
	Use MAKE_LIB and MAKE_STUB_LIB from tcl.m4.
	Remove AC_SUBST calls that are no done in tcl.m4.
	* unix/tcl.m4: Update from Tcl.
	* unix/tkConfig.sh.in: Subst CC_SEARCH_FLAGS and
	LD_SEARCH_FLAGS.

1 files changed, 31 insertions, 25 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index fb44af3..e1b93c5 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,12 +5,15 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.77 2002/07/16 23:17:09 mdejong Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.78 2002/07/28 03:23:08 mdejong Exp $
 
 # Current Tk version;  used in various names.
 
 TCLVERSION		= @TCL_VERSION@
 VERSION			= @TK_VERSION@
+MAJOR_VERSION		= @TK_MAJOR_VERSION@
+MINOR_VERSION		= @TK_MINOR_VERSION@
+PATCH_LEVEL		= @TK_PATCH_LEVEL@
 LOCALES			= @LOCALES@
 
 #----------------------------------------------------------------
@@ -171,6 +174,7 @@ SHELL			= /bin/sh
 
 INSTALL			= @srcdir@/install-sh -c
 INSTALL_PROGRAM		= ${INSTALL}
+INSTALL_LIBRARY		= ${INSTALL}
 INSTALL_DATA		= ${INSTALL} -m 644
 
 # TCL_EXE is the name of a tclsh executable that is available *BEFORE*
@@ -193,12 +197,18 @@ STUB_LIB_FILE		= @TK_STUB_LIB_FILE@
 TK_STUB_LIB_FILE	= @TK_STUB_LIB_FILE@
 #TK_STUB_LIB_FILE	= libtkstub.a
 
+# Generic stub lib name used in rules that apply to tcl and tk
+STUB_LIB_FILE		= ${TK_STUB_LIB_FILE}
+
 TK_STUB_LIB_FLAG	= @TK_STUB_LIB_FLAG@
 #TK_STUB_LIB_FLAG	= -ltkstub
 
 TK_LIB_FILE		= @TK_LIB_FILE@
 #TK_LIB_FILE		= libtk.a
 
+# Generic lib name used in rules that apply to tcl and tk
+LIB_FILE		= ${TK_LIB_FILE}
+
 TK_LIB_FLAG		= @TK_LIB_FLAG@
 #TK_LIB_FLAG		= -ltk
 
@@ -226,8 +236,8 @@ SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
 # Additional search flags needed to find the various shared libraries
 # at run-time.  The first symbol is for use when creating a binary
 # with cc, and the second is for use when running ld directly.
-TK_CC_SEARCH_FLAGS	= @TK_CC_SEARCH_FLAGS@
-TK_LD_SEARCH_FLAGS	= @TK_LD_SEARCH_FLAGS@
+CC_SEARCH_FLAGS	= @CC_SEARCH_FLAGS@
+LD_SEARCH_FLAGS	= @LD_SEARCH_FLAGS@
 
 #----------------------------------------------------------------
 # The information below is modified by the configure script when
@@ -371,7 +381,7 @@ DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
 
 all: binaries libraries doc
 
-binaries: ${TK_LIB_FILE} ${STUB_LIB_FILE} wish
+binaries: ${LIB_FILE} ${STUB_LIB_FILE} wish
 
 libraries:
 
@@ -383,15 +393,13 @@ doc: $(SRC_DIR)/doc/man.macros
 
 # The following target is configured by autoconf to generate either
 # a shared library or non-shared library for Tk.
-${TK_LIB_FILE}: ${OBJS}
-	rm -f ${TK_LIB_FILE}
+${LIB_FILE}: ${OBJS}
+	rm -f $@
 	@MAKE_LIB@
-	$(RANLIB) ${TK_LIB_FILE}
 
 ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
-	rm -f ${STUB_LIB_FILE}
+	rm -f $@
 	@MAKE_STUB_LIB@
-	$(RANLIB) ${STUB_LIB_FILE}
 
 # Make target which outputs the list of the .o contained in the Tk lib
 # usefull to build a single big shared library containing Tcl/Tk and other
@@ -407,7 +415,7 @@ objs: ${OBJS}
 wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
 	$(CC) $(LDFLAGS) $(WISH_OBJS) \
 		@TK_BUILD_LIB_SPEC@ \
-		$(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o wish
+		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o wish
 
 # Resetting the LIB_RUNTIME_DIR below is required so that
 # the generated tktest executable gets the build directory
@@ -421,16 +429,16 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
 tktest-real:
 	${CC} $(LDFLAGS) $(TKTEST_OBJS) \
 		@TK_BUILD_LIB_SPEC@ \
-		$(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o tktest
+		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o tktest
 
 # FIXME: This xttest rule seems to be broken in a number of ways.
-# It should use TK_CC_SEARCH_FLAGS, it does not include the shared
+# It should use CC_SEARCH_FLAGS, it does not include the shared
 # lib location logic from tktest, and it is not clear where this
 # test.o object file comes from.
 xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
 	${CC} $(LDFLAGS) test.o tkTest.o tkSquare.o \
 		@TK_BUILD_LIB_SPEC@ \
-		$(WISH_LIBS) $(TK_LD_SEARCH_FLAGS) -lXt -o xttest
+		$(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest
 
 # Note, in the target below TCL_LIBRARY needs to be set or else
 # "make test" won't work in the case where the compilation directory
@@ -503,8 +511,6 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
 	@if test ! -x $(UNIX_DIR)/install-sh; then \
 	    chmod +x $(UNIX_DIR)/install-sh; \
 	    fi
-	@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
-	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
 	@if test "$(TK_SHARED_BUILD)"; then \
 	    echo "Creating package index $(PKG_INDEX)"; \
 	    rm -f $(PKG_INDEX); \
@@ -515,8 +521,9 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
 	    echo "    [list load [file join \$$dir .. \\" >> $(PKG_INDEX); \
 	    echo "    $(TK_LIB_FILE)] Tk]" >> $(PKG_INDEX); \
 	    fi
-	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
-	@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
+	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
+	@@INSTALL_LIB@
+	@chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE)
 	@echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
 	@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
 	@echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/"
@@ -525,12 +532,11 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
 	    echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
 	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
 			$(LIB_INSTALL_DIR)/$(TK_EXP_FILE); \
-	    fi
-	@if test "$(TK_STUB_LIB_FILE)" != "" ; then \
-	    echo "Installing $(TK_STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
-	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
-			 $(LIB_INSTALL_DIR)/$(TK_STUB_LIB_FILE); \
-	    fi
+	fi
+	@if test "$(STUB_LIB_FILE)" != "" ; then \
+	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
+	    @INSTALL_STUB_LIB@ ; \
+	fi
 
 install-libraries:
 	@for i in $(INCLUDE_INSTALL_DIR) \
@@ -1047,8 +1053,8 @@ mklinks:
 #
 
 DISTROOT = /tmp/dist
-DISTNAME =	tk@TK_VERSION@@TK_PATCH_LEVEL@
-ZIPNAME =	tk@TK_MAJOR_VERSION@@TK_MINOR_VERSION@@TK_PATCH_LEVEL@.zip
+DISTNAME =	tk${TK_VERSION}${TK_PATCH_LEVEL}
+ZIPNAME =	tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_PATCH_LEVEL}.zip
 DISTDIR =	$(DISTROOT)/$(DISTNAME)
 TCLDIR = 	@TCL_SRC_DIR@
 $(UNIX_DIR)/configure: $(UNIX_DIR)/configure.in