summaryrefslogtreecommitdiffstats
path: root/unix/Makefile.in
diff options
context:
space:
mode:
authorescoffon <escoffon>1998-07-21 15:29:04 (GMT)
committerescoffon <escoffon>1998-07-21 15:29:04 (GMT)
commit4f44a7f538df22b28f9c746b923dc6458bace717 (patch)
tree3d4d7822d2928425bdf731d780bf866c0ddc1379 /unix/Makefile.in
parent4eecf8bd2afe8a67d15da30c4218233f9bee11b7 (diff)
downloadtk-4f44a7f538df22b28f9c746b923dc6458bace717.zip
tk-4f44a7f538df22b28f9c746b923dc6458bace717.tar.gz
tk-4f44a7f538df22b28f9c746b923dc6458bace717.tar.bz2
Merged changes between child workspace "/home/escoffon/ws/tk8.0" and
parent workspace "/export/home/ws/tk8.0".
Diffstat (limited to 'unix/Makefile.in')
-rw-r--r--unix/Makefile.in12
1 files changed, 9 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 725f9ab..63a56a5 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -159,6 +159,12 @@ TK_SHLIB_CFLAGS = @TK_SHLIB_CFLAGS@
TK_LIB_FILE = @TK_LIB_FILE@
#TK_LIB_FILE = libtk.a
+TK_LIB_FLAG = @TK_LIB_FLAG@
+#TK_LIB_FLAG = -ltk
+
+TCL_LIB_FLAG = @TCL_LIB_FLAG@
+#TCL_LIB_FLAG = -ltcl
+
# The symbol below provides support for dynamic loading and shared
# libraries. See configure.in for a description of what it means.
# The values of the symbolis normally set by the configure script.
@@ -295,10 +301,10 @@ all: wish
# 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@
+${TK_LIB_FILE}: ${OBJS}
+ rm -f ${TK_LIB_FILE}
@MAKE_LIB@
- $(RANLIB) @TK_LIB_FILE@
+ $(RANLIB) ${TK_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