From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22360 invoked by alias); 16 Apr 2008 17:45:22 -0000 Received: (qmail 22335 invoked by uid 367); 16 Apr 2008 17:45:22 -0000 Date: Wed, 16 Apr 2008 17:45:00 -0000 Message-ID: <20080416174522.22320.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Use the input file name to determine a SUBST output file type. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 0dbbd62ddb3f23e9e5c8ee8d2fb72458bdfbc9e9 X-Git-Newrev: 09aea1d0cc8533a671774fba910304ee4001b767 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q2/txt/msg00112.txt.bz2 The branch, master has been updated via 09aea1d0cc8533a671774fba910304ee4001b767 (commit) from 0dbbd62ddb3f23e9e5c8ee8d2fb72458bdfbc9e9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 09aea1d0cc8533a671774fba910304ee4001b767 Author: Andrew Cagney Date: Wed Apr 16 13:42:54 2008 -0400 Use the input file name to determine a SUBST output file type. frysk-common/ChangeLog 2008-04-16 Andrew Cagney * Makefile.rules (SUBST): Match -in input file name, not output file name when selecting action. ----------------------------------------------------------------------- Summary of changes: frysk-common/ChangeLog | 5 +++++ frysk-common/Makefile.rules | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) First 500 lines of diff: diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog index c4854cf..09e6375 100644 --- a/frysk-common/ChangeLog +++ b/frysk-common/ChangeLog @@ -1,3 +1,8 @@ +2008-04-16 Andrew Cagney + + * Makefile.rules (SUBST): Match -in input file name, not output + file name when selecting action. + 2008-04-15 Andrew Cagney * TestRunner.java-in: Use PrefixFactory. diff --git a/frysk-common/Makefile.rules b/frysk-common/Makefile.rules index 59d6005..4a90e3a 100644 --- a/frysk-common/Makefile.rules +++ b/frysk-common/Makefile.rules @@ -285,13 +285,13 @@ SUBST = \ mkdir -p `dirname $@` ; \ rm -f $@.tmp ; \ touch $@.tmp ; \ - case "$@" in \ - *.cxx | *.c) \ + case "$<" in \ + *.cxx-in | *.c-in) \ echo '// Generated from: $<' >> $@.tmp ; \ echo '' >> $@.tmp ; \ echo '\#line 1 "$<"' >> $@.tmp ; \ ;; \ - *.java) \ + *.java-in) \ echo '// Generated from: $<' >> $@.tmp ; \ echo '' >> $@.tmp ; \ ;; \ hooks/post-receive -- frysk system monitor/debugger