summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2009-11-23 16:09:33 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2009-11-23 16:09:33 (GMT)
commitbb110b19891f138458016add065c7dae4d7e2b39 (patch)
treed0e639f266469ceaee625f0ec97ad22b267558bb
parent596d16d10b16b1c9bd2990e294c56303024de03b (diff)
downloadtk-bb110b19891f138458016add065c7dae4d7e2b39.zip
tk-bb110b19891f138458016add065c7dae4d7e2b39.tar.gz
tk-bb110b19891f138458016add065c7dae4d7e2b39.tar.bz2
Better fix for the problem when someone tricks make into thinking 'test' is a
real target.
-rw-r--r--ChangeLog9
-rw-r--r--unix/Makefile.in13
2 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index aaae10c..a231033 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
+2009-11-23 Donal K. Fellows <dkf@users.sf.net>
+
+ * unix/Makefile.in: Added .PHONY lines to stop make from getting
+ confused when someone makes an error in a rule.
+
2009-11-22 Pat Thoyts <patthoyts@users.sourceforge.net>
- * tests/winWm.test: Make sure the window is still present
- * win/tkWinWm.c: when handling delayed activation [Bug 2899949]
+ * tests/winWm.test: [Bug 2899949]: Make sure the window is still
+ * win/tkWinWm.c: present when handling delayed activation.
* win/Makefile.vc: Include tk stubs in the tktest link
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 26e3c42..317081a 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.163 2009/11/23 15:59:18 dkf Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.164 2009/11/23 16:09:33 dkf Exp $
# Current Tk version; used in various names.
@@ -1711,4 +1711,15 @@ BUILD_HTML = \
"$${TCLSH}" $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \
--srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS)
+#
+# The list of all the targets that do not correspond to real files. This stops
+# 'make' from getting confused when someone makes an error in a rule.
+#
+
+.PHONY: all binaries libraries doc tkLibObjs objs tktest-real test test-classic
+.PHONY: test-ttk testlang runtest shell demo gdb install install-strip
+.PHONY: install-binaries install-libraries install-demos install-doc
+.PHONY: install-private-headers clean distclean depend genstubs checkstubs
+.PHONY: checkuchar checkexports rpm dist alldist allpatch html html-tcl html-tk
+
# DO NOT DELETE THIS LINE -- make depend depends on it.