summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--unix/Makefile.in11
-rw-r--r--unix/dltest/Makefile.in6
3 files changed, 19 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d6b47f..eb9c633 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2002-07-16 Mo DeJong <mdejong@users.sourceforge.net>
+ * unix/Makefile.in: Use dltest.marker file
+ to keep track of when the dltest package
+ is up to date. This fixes [Tcl bug 575768]
+ since tcltest is no longer linked every time.
+ * unix/dltest/Makefile.in: Create ../dltest.marker
+ after a successful `make all` run in dltest.
+
+2002-07-16 Mo DeJong <mdejong@users.sourceforge.net>
+
* unix/configure: Regen.
* unix/configure.in: Remove useless subst of TCL_BIN_DIR.
diff --git a/unix/Makefile.in b/unix/Makefile.in
index bb2b999..9e33e45 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.105 2002/07/05 10:38:43 dkf Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.106 2002/07/16 22:44:43 mdejong Exp $
VERSION = @TCL_VERSION@
@@ -194,7 +194,7 @@ SHLIB_CFLAGS = @SHLIB_CFLAGS@
SHLIB_SUFFIX = @SHLIB_SUFFIX@
#SHLIB_SUFFIX =
-DLTEST_TARGETS = dlpkgs
+DLTEST_TARGETS = dltest.marker
# The following symbol is defined to "$(DLTEST_TARGETS)" if dynamic
# loading is available; this causes everything in the "dltest"
@@ -560,12 +560,13 @@ gendate:
<y.tab.c >$(GENERIC_DIR)/tclDate.c
rm y.tab.c
-# The following targets generate the shared libraries in dltest/ that
+# The following target generates the shared libraries in dltest/ that
# are used for testing; they are included as part of the "tcltest"
# target (via the BUILD_DLTEST variable) if dynamic loading is supported
-# on this platform.
+# on this platform. The Makefile in the dltest subdirectory creates
+# the dltest.marker file in this directory after a successful build.
-dlpkgs:
+dltest.marker:
cd dltest ; $(MAKE)
install: install-binaries install-libraries install-doc
diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in
index 5d0776e..f9dd775 100644
--- a/unix/dltest/Makefile.in
+++ b/unix/dltest/Makefile.in
@@ -1,7 +1,7 @@
# This Makefile is used to create several test cases for Tcl's load
# command. It also illustrates how to take advantage of configuration
# exported by Tcl to set up Makefiles for shared libraries.
-# RCS: @(#) $Id: Makefile.in,v 1.10 2002/06/06 19:45:47 mdejong Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.11 2002/07/16 22:44:43 mdejong Exp $
TCL_DBGX = @TCL_DBGX@
CC = @CC@
@@ -22,6 +22,7 @@ CC_SWITCHES = $(CFLAGS) -I${SRC_DIR}/../../generic -DTCL_MEM_DEBUG \
${SHLIB_CFLAGS} -DUSE_TCL_STUBS ${AC_FLAGS}
all: pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUFFIX} pkgc${SHLIB_SUFFIX} pkgd${SHLIB_SUFFIX} pkge${SHLIB_SUFFIX}
+ @touch ../dltest.marker
pkga${SHLIB_SUFFIX}: $(SRC_DIR)/pkga.c
$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkga.c
@@ -44,7 +45,8 @@ pkge${SHLIB_SUFFIX}: $(SRC_DIR)/pkge.c
${SHLIB_LD} -o pkge${SHLIB_SUFFIX} pkge.o ${SHLIB_LD_LIBS}
clean:
- rm -f *.o *${SHLIB_SUFFIX} config.cache config.log config.status lib.exp
+ rm -f *.o *${SHLIB_SUFFIX} config.cache config.log config.status
+ rm -f lib.exp ../dltest.marker
distclean: clean
rm -f Makefile