[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-NG] [PATCH] [ng] subdirs: verbatim include of relevant makefil
From: |
Stefano Lattarini |
Subject: |
[Automake-NG] [PATCH] [ng] subdirs: verbatim include of relevant makefile fragment |
Date: |
Sat, 11 Aug 2012 18:49:31 +0200 |
* lib/am/subdirs.am: Rename ...
* lib/am/subdirs.mk: ... like this. Prefer '#' comments over
'##' ones.
* automake.in (handle_subdirs): Include it with the 'verbatim'
function rather than with the 'file_contents' one.
(generate_makefile): Move its call later. This is actually required
to avoid spurious failures.
* Makefile.am (dist_am_DATA): Adjust.
Signed-off-by: Stefano Lattarini <address@hidden>
---
Makefile.am | 2 +-
automake.in | 6 ++++--
lib/am/{subdirs.am => subdirs.mk} | 5 ++---
3 files changed, 7 insertions(+), 6 deletions(-)
rename lib/am/{subdirs.am => subdirs.mk} (95%)
diff --git a/Makefile.am b/Makefile.am
index 6a773a9..899d301 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -197,6 +197,7 @@ dist_am_DATA = \
lib/am/dejagnu.mk \
lib/am/distcheck.mk \
lib/am/distdir.mk \
+ lib/am/subdirs.mk \
lib/am/compile.am \
lib/am/configure.am \
lib/am/data.am \
@@ -218,7 +219,6 @@ dist_am_DATA = \
lib/am/python.am \
lib/am/remake-hdr.am \
lib/am/scripts.am \
- lib/am/subdirs.am \
lib/am/texi-vers.am \
lib/am/texi-spec.am \
lib/am/texinfos.am \
diff --git a/automake.in b/automake.in
index 17e4c63..7361945 100644
--- a/automake.in
+++ b/automake.in
@@ -3357,7 +3357,7 @@ sub handle_subdirs ()
check_directories_in_var $dsubdirs
if $dsubdirs;
- $output_rules .= &file_contents ('subdirs', new Automake::Location);
+ verbatim ('subdirs');
}
@@ -6736,7 +6736,6 @@ sub generate_makefile ($$)
handle_data;
handle_headers;
verbatim ('tags');
- handle_subdirs;
handle_user_recursion;
handle_minor_options;
@@ -6762,6 +6761,9 @@ sub generate_makefile ($$)
verbatim ('common-targets');
handle_clean ();
+ # This must really come late.
+ handle_subdirs;
+
handle_factored_dependencies;
# Comes last, because all the above procedures may have
diff --git a/lib/am/subdirs.am b/lib/am/subdirs.mk
similarity index 95%
rename from lib/am/subdirs.am
rename to lib/am/subdirs.mk
index aa1eef4..de1faa4 100644
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.mk
@@ -23,8 +23,8 @@ am__recursive_targets = \
$(RECURSIVE_CLEAN_TARGETS) \
$(am.recurs.extra-targets)
-## All documented targets which invoke 'make' recursively, or depend
-## on targets that do so. GNUmakefile from gnulib depends on this.
+# All documented targets which invoke 'make' recursively, or depend
+# on targets that do so. GNUmakefile from gnulib depends on this.
AM_RECURSIVE_TARGETS += $(am__recursive_targets:-recursive=)
.PHONY: $(am__recursive_targets)
@@ -72,4 +72,3 @@ mostlyclean: mostlyclean-recursive
clean: clean-recursive
distclean: distclean-recursive
maintainer-clean: maintainer-clean-recursive
-
--
1.7.12.rc0
- [Automake-NG] [PATCH] [ng] subdirs: verbatim include of relevant makefile fragment,
Stefano Lattarini <=