2001-05-08 Tom Tromey <tromey@redhat.com>
+ * 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.
## --------------------------------- ##
## Forward subroutine declarations. ##
## --------------------------------- ##
-sub register_language ($%);
-sub file_contents_internal ($%);
+sub register_language (%);
+sub file_contents_internal ($$%);
# &initialize_per_input ()
$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');
# 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) = @_;
# 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) = @_;