diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2011-02-07 13:36:13 +0100 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2011-02-07 13:36:13 +0100 |
| commit | 2350852fd520502af82a2acbb4adfdd0e1f4cf0a (patch) | |
| tree | 60d577f4137925743be80a3dc6bd69119a6fe218 | |
| parent | 870707b48a4d2b3fbc8c861f6b68ccc8803a9791 (diff) | |
autotools: Makefile-gen.am -> Makefile.am
Patching the top-level Makefile.am is no longer necessary
thanks to the simplified gen-autotools.sh approach. Renaming
it back to the normal Makefile.am.
| -rw-r--r-- | Makefile.am (renamed from Makefile-gen.am) | 7 | ||||
| -rwxr-xr-x | gen-autotools.sh | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/Makefile-gen.am b/Makefile.am index 2976c2b3..100789ba 100644 --- a/Makefile-gen.am +++ b/Makefile.am @@ -27,7 +27,6 @@ EXTRA_DIST = \ configure-post.in \ gen-autotools.sh \ autogen.sh \ - Makefile-gen.am \ Doxyfile MAINTAINERCLEANFILES = Makefile.in config.h.in config.guess config.sub configure depcomp install-sh ltmain.sh missing mkinstalldirs @@ -176,17 +175,15 @@ clean-local: clean-html clean-html: rm -rf html -# configure.in and Makefile.am are updated +# configure.in is updated # by gen-autotools.sh. This scripts is run # each time "make all" (which depends on "Makefile") # runs; this is easier than trying to anticipated # when the script would produce different output. # The no-op "true" seem to be necessary for make to -# re-check the configure.in and Makefile.am time stamps. +# re-check the configure.in time stamps. $(srcdir)/configure.in: check-autotools @ true -$(srcdir)/Makefile.am: check-autotools - @ true # Rebuilding the autotools files should never be necessary # with source tar balls. Some parts of it depend on "git describe". diff --git a/gen-autotools.sh b/gen-autotools.sh index 461f73b4..4eed5f5e 100755 --- a/gen-autotools.sh +++ b/gen-autotools.sh @@ -146,16 +146,12 @@ update $out TEMPLATE_FILES=`cd src && find templates -type f \( -name README -o -name '*.png' -o -name '*.svg' -o -name '*.ini' \) | sort` TEMPLATE_FILES=`echo $TEMPLATE_FILES` -# create Makefile.am files +# create src/Makefile.am file sed -e "s;@BACKEND_REGISTRIES@;`echo src/backends/*/*Register.cpp | sed -e s%src/%%g`;" \ -e "s;@BACKENDS@;$BACKENDS;" \ -e "s;@TEMPLATE_FILES@;$TEMPLATE_FILES;" \ src/Makefile-gen.am >src/Makefile.am.new update src/Makefile.am -sed -e "s;@CONFIG_SUBS@;$SUBS;" \ - Makefile-gen.am >Makefile.am.new -update Makefile.am - # create LINGUAS file: every .po is included (cd po && ls -1 *.po | sort -u | sed -e 's/.po$//' > LINGUAS.new && update LINGUAS) |