From bb110b19891f138458016add065c7dae4d7e2b39 Mon Sep 17 00:00:00 2001 From: dkf Date: Mon, 23 Nov 2009 16:09:33 +0000 Subject: Better fix for the problem when someone tricks make into thinking 'test' is a real target. --- ChangeLog | 9 +++++++-- unix/Makefile.in | 13 ++++++++++++- 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 + + * 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 - * 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. -- cgit v0.12