2002-01-06 Raja R Harinath <harinath@cs.umn.edu>

	* automake.in (handle_languages): Emit an automake
        internal variable 'am__depfiles_maybe'.
	* lib/am/configure.am (%MAKEFILE%): Use am__depfiles_maybe.

diff --git a/ChangeLog b/ChangeLog
index 6f7c3f37e9ad079f3263bae60f5a4c9254dc90e7..2012852ebd0de665021013bc0d0212c8d0418929 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-01-06  Raja R Harinath  <harinath@cs.umn.edu>
 
+       * automake.in (handle_languages): Emit an automake
+        internal variable 'am__depfiles_maybe'.
+       * lib/am/configure.am (%MAKEFILE%): Use am__depfiles_maybe.
+
        * lib/am/configure.am (%MAKEFILE%): Pass `depfiles' to
        config.status.
 

diff --git a/automake.in b/automake.in
index 28ff84e01c517c7082027d1e9b67d2fe7a7baa0d..fd8916a5dc37b3e7661008af42fc8fed60d2088a 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1535,6 +1535,7 @@ sub handle_languages
        {
            # Set location of depcomp.
            &define_variable ('depcomp', "\$(SHELL) $config_aux_dir/depcomp");
+           &define_variable ('am__depfiles_maybe', 'depfiles');
 
            require_conf_file ("$am_file.am", FOREIGN, 'depcomp');
 
@@ -1567,6 +1568,7 @@ sub handle_languages
     else
     {
        &define_variable ('depcomp', '');
+       &define_variable ('am__depfiles_maybe', '');
     }
 
     my %done;

diff --git a/lib/am/configure.am b/lib/am/configure.am
index a9a7143961fbbe3cf97356c6550dc69e66ee7565..465c57731a6912763fcaf9374b1a9a9dcaf3c021 100644 (file)
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -28,9 +28,9 @@
 
 ## This rule remakes the Makefile.
 %MAKEFILE%: %MAINTAINER-MODE% %MAKEFILE-IN% %MAKEFILE-DEPS% $(top_builddir)/config.status
-## FIXME: `depfiles' lets us re-run the rule to create the .P files.
-## Ideally we wouldn't have to do this by hand.
-       cd $(top_builddir) && $(SHELL) ./config.status %CONFIG-MAKEFILE% depfiles
+## FIXME: $(am__depfiles_maybe) lets us re-run the rule to create the
+## .P files.  Ideally we wouldn't have to do this by hand.
+       cd $(top_builddir) && $(SHELL) ./config.status %CONFIG-MAKEFILE% $(am__depfiles_maybe)