From a462af47ac2ce098d3d81f0719cea55badd7a8f2 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 8 May 2001 18:30:45 +0000 Subject: [PATCH] * automake.in (check_libobjs_sources): Re-fixed AMDEP_TRUE problem. * automake.in (file_contents_internal): Prototype now `$$%'. (register_language): Prototype now `%'. --- ChangeLog | 6 ++++++ automake.in | 15 +++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7d115c7..9c8737ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2001-05-08 Tom Tromey + * automake.in (check_libobjs_sources): Re-fixed AMDEP_TRUE + problem. + + * automake.in (file_contents_internal): Prototype now `$$%'. + (register_language): Prototype now `%'. + Fixes test subobj6.test and PR automake/160: * tests/Makefile.am (XFAIL_TESTS): Removed subobj6.test. * compile.am (mostlyclean-compile): Added MOSTLYRMS. diff --git a/automake.in b/automake.in index e69e3184..ab93948a 100755 --- a/automake.in +++ b/automake.in @@ -654,8 +654,8 @@ my $get_object_extension_was_run; ## --------------------------------- ## ## Forward subroutine declarations. ## ## --------------------------------- ## -sub register_language ($%); -sub file_contents_internal ($%); +sub register_language (%); +sub file_contents_internal ($$%); # &initialize_per_input () @@ -1796,7 +1796,10 @@ sub check_libobjs_sources $output_rules .= "\n"; foreach my $iter (@deplist) { - $output_rules .= '@AMDEP_TRUE@@_am_include@ ' . $iter . "\n"; + # The strange concatentation is used to avoid + # substitutions from our own configure. + $output_rules .= ('@AMDEP' . '_TRUE@@_am_include@ ' + . $iter . "\n"); } $output_rules .= &file_contents ('depend'); @@ -5378,9 +5381,9 @@ sub saw_sources_p # register_language (%ATTRIBUTE) # ------------------------------ -# Register a single language. LANGUAGE is the name of the language. +# Register a single language. # Each %ATTRIBUTE is of the form ATTRIBUTE => VALUE. -sub register_language ($%) +sub register_language (%) { my (%option) = @_; @@ -6946,7 +6949,7 @@ sub make_paragraphs ($%) # Return contents of a file from $am_dir, automatically skipping # macros or rules which are already known. $IS_AM iff the caller is # reading an Automake file (as opposed to the user's Makefile.am). -sub file_contents_internal ($%) +sub file_contents_internal ($$%) { my ($is_am, $file, %transform) = @_; -- 2.43.5