Changes to make the Tk configure and Makefile.in files TEA compliant.

1 files changed, 19 insertions, 10 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index e0f5e90..04984b9 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.17 1999/04/30 18:02:39 redman Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.18 1999/06/15 22:23:19 wart Exp $
 
 # Current Tk version;  used in various names.
 
@@ -82,9 +82,11 @@ TCL_UNIX_DIR =		@TCL_SRC_DIR@/unix
 # for this version of Tk:
 TCL_BIN_DIR =		@TCL_BIN_DIR@
 
+# The linker flags needed to link in the Tcl library (ex: -ltcl8.1)
+TCL_LIB_FLAG =		@TCL_LIB_FLAG@
+
 # Libraries built with optimization switches have this additional extension
 TK_DBGX =		@TK_DBGX@
-TCL_DBGX =		@TCL_DBGX@
 
 # warning flags
 CFLAGS_WARNING =	@CFLAGS_WARNING@
@@ -98,7 +100,7 @@ CFLAGS_OPTIMIZE =	@CFLAGS_OPTIMIZE@
 #CFLAGS = 		$(CFLAGS_DEBUG)
 #CFLAGS = 		$(CFLAGS_OPTIMIZE)
 #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
-CFLAGS = 		$(@CFLAGS_DEFAULT@)
+CFLAGS = 		@CFLAGS@
 
 # A "-I" switch that can be used when compiling to make all of the
 # X11 include files accessible (the configure script will try to
@@ -162,7 +164,7 @@ INSTALL_DATA =		${INSTALL} -m 644
 # configure script.  You shouldn't normally need to modify any of
 # these definitions by hand.
 
-TK_SHLIB_CFLAGS = @TK_SHLIB_CFLAGS@
+SHLIB_CFLAGS = @SHLIB_CFLAGS@
 
 # To enable support for stubs in Tcl.
 STUB_LIB_FILE = @STUB_LIB_FILE@
@@ -179,7 +181,8 @@ TK_LIB_FILE = @TK_LIB_FILE@
 TK_LIB_FLAG = @TK_LIB_FLAG@
 #TK_LIB_FLAG = -ltk
 
-TCL_LIB_SPEC = @TCL_BUILD_LIB_SPEC@
+#TCL_LIB_SPEC = @TCL_BUILD_LIB_SPEC@
+TCL_LIB_SPEC = @TCL_LIB_SPEC@
 TK_EXP_FILE = @TK_EXP_FILE@
 TK_BUILD_EXP_FILE = @TK_BUILD_EXP_FILE@
 
@@ -226,7 +229,7 @@ TOOL_DIR =		@TCL_SRC_DIR@/tools
 
 CC =		@CC@
 
-CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${TK_SHLIB_CFLAGS} \
+CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
 -I${UNIX_DIR} -I${GENERIC_DIR} \
 -I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} \
 ${AC_FLAGS} ${PROTO_FLAGS} \
@@ -341,7 +344,13 @@ HDRS = bltList.h \
 
 DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
 
-all: wish
+all: binaries libraries doc
+
+binaries: ${TK_LIB_FILE} ${STUB_LIB_FILE} wish
+
+libraries:
+
+doc:
 
 # The following target is configured by autoconf to generate either
 # a shared library or non-shared library for Tk.
@@ -404,7 +413,7 @@ runtest:
 	TK_LIBRARY=@TK_SRC_DIR@/library; export TK_LIBRARY; \
 	./tktest
 
-install: install-binaries install-libraries install-demos install-man
+install: install-binaries install-libraries install-demos install-doc
 
 # Note: before running ranlib below, must cd to target directory because
 # some ranlibs write to current directory, and this might not always be
@@ -500,7 +509,7 @@ install-demos:
 		fi; \
 	    done;
 
-install-man:
+install-doc:
 	@for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3_INSTALL_DIR) $(MANN_INSTALL_DIR) ; \
 	    do \
 	    if [ ! -d $$i ] ; then \
@@ -1094,7 +1103,7 @@ package-config:
 package-common:
 	cd $(DISTDIR)/unix/`arch`;\
 	$(MAKE); \
-	$(MAKE) install-libraries install-man \
+	$(MAKE) install-libraries install-doc \
 		prefix=$(DISTDIR)/SUNWtcl/$(TCLVERSION) \
 		exec_prefix=$(DISTDIR)/SUNWtcl/$(TCLVERSION)/`arch`
 	mkdir -p $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin