From 3b52bf3faaef4803c53b0a7413945d0716e43d86 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 7 Jan 2002 00:37:50 +0000 Subject: [PATCH] 2002-01-06 Raja R Harinath * automake.in (handle_languages): Emit an automake internal variable 'am__depfiles_maybe'. * lib/am/configure.am (%MAKEFILE%): Use am__depfiles_maybe. --- ChangeLog | 4 ++++ automake.in | 2 ++ lib/am/configure.am | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f7c3f37e..2012852eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2002-01-06 Raja R Harinath + * 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 28ff84e01..fd8916a5d 100755 --- 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 a9a714396..465c57731 100644 --- 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) -- 2.47.2