diff options
| author | Colin Watson <cjwatson@ubuntu.com> | 2013-11-13 12:42:24 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@ubuntu.com> | 2013-11-26 17:13:01 +0000 |
| commit | ab4f15013aab24a160cb7690c89015ab29e8e045 (patch) | |
| tree | cdde27b29b38e435d56f57e50bb3e4a386062af9 /conf | |
| parent | 1e4b3587200cf0d8fb15d6b131882cc35fff95e6 (diff) | |
Generate Makefile.*.am directly from gentpl.py, eliminating the use of Autogen. The Autogen definitions files remain intact as they offer a useful abstraction.
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/Makefile.common | 15 | ||||
| -rw-r--r-- | conf/Makefile.extra-dist | 1 |
2 files changed, 5 insertions, 11 deletions
diff --git a/conf/Makefile.common b/conf/Makefile.common index 9f0d1d6d5..d887df184 100644 --- a/conf/Makefile.common +++ b/conf/Makefile.common @@ -131,20 +131,15 @@ EXTRA_DIST = CLEANFILES = BUILT_SOURCES = -# Rules for autogen definition files - -.PRECIOUS: $(top_srcdir)/Makefile.tpl -$(top_srcdir)/Makefile.tpl: $(top_srcdir)/gentpl.py - python $< | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1) - mv $@.new $@ +# Rules for Automake input .PRECIOUS: $(top_srcdir)/Makefile.util.am -$(top_srcdir)/Makefile.util.am: $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.utilgcry.def $(top_srcdir)/Makefile.tpl - cat $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.utilgcry.def | autogen -T $(top_srcdir)/Makefile.tpl | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1) +$(top_srcdir)/Makefile.util.am: $(top_srcdir)/gentpl.py $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.utilgcry.def + python $^ > $@.new || (rm -f $@.new; exit 1) mv $@.new $@ .PRECIOUS: $(top_srcdir)/grub-core/Makefile.core.am -$(top_srcdir)/grub-core/Makefile.core.am: $(top_srcdir)/grub-core/Makefile.core.def $(top_srcdir)/grub-core/Makefile.gcry.def $(top_srcdir)/Makefile.tpl +$(top_srcdir)/grub-core/Makefile.core.am: $(top_srcdir)/gentpl.py $(top_srcdir)/grub-core/Makefile.core.def $(top_srcdir)/grub-core/Makefile.gcry.def if [ "x$$GRUB_CONTRIB" != x ]; then echo "You need to run ./autogen.sh manually." >&2; exit 1; fi - cat $(top_srcdir)/grub-core/Makefile.core.def $(top_srcdir)/grub-core/Makefile.gcry.def | autogen -T $(top_srcdir)/Makefile.tpl | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1) + python $^ > $@.new || (rm -f $@.new; exit 1) mv $@.new $@ diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist index 72b00c043..e0c915c4c 100644 --- a/conf/Makefile.extra-dist +++ b/conf/Makefile.extra-dist @@ -2,7 +2,6 @@ EXTRA_DIST += autogen.sh EXTRA_DIST += geninit.sh EXTRA_DIST += gentpl.py -EXTRA_DIST += Makefile.tpl EXTRA_DIST += Makefile.util.def EXTRA_DIST += Makefile.utilgcry.def |