diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-05 21:05:43 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-06 12:26:37 +0200 |
commit | a2af455752a0e24546f650e83edc74741c117430 (patch) | |
tree | c694b90b13cbd730fc85adda767922c9146a7536 /bin | |
parent | f8ac780d14229e99d70b46b50e3d026e2c93a6a3 (diff) | |
download | autoconf-a2af455752a0e24546f650e83edc74741c117430.tar.gz |
build: no more recursion for lib 'subdir'
* Makefile.am (SUBDIRS): Drop 'lib'.
(edit): New, shared among the recipes in 'lib/local.mk' and
'bin/local.mk'.
(CLEANFILES): New, will be updated later in included files.
($(srcdir)/lib/local.mk): Include it.
($(srcdir)/lib/freeze.mk): Likewise.
* lib/Makefile.am: Rename ...
* lib/local.mk: .. like this, with several adjustments. In
particular ...
(edit): Drop this definition, subsumed by the one in the
top-level Makefile.am.
* bin/local.mk (edit): Drop definition, that is already present
in the top-level Makefile.am now.
($(srcdir)/lib/freeze.mk): Drop inclusion; that is already done
in the top-level Makefile.am now.
* doc/local.mk (CLEANFILES): Adjust: append to it, do not define
it.
* lib/freeze.mk ($(AUTOM4TE_CFG)): Adjust recipe.
* configure.ac (AC_CONFIG_FILES): Drop 'lib/Makefile'.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'bin')
-rw-r--r-- | bin/local.mk | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/bin/local.mk b/bin/local.mk index ff7b2cfd..c4ed17f7 100644 --- a/bin/local.mk +++ b/bin/local.mk @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -include $(srcdir)/lib/freeze.mk - bin_SCRIPTS = \ bin/autoconf \ bin/autoheader \ @@ -42,25 +40,6 @@ MOSTLYCLEANFILES += $(bin_SCRIPTS) bin/autoconf.in bin/*.tmp ## The scripts. ## ## ------------- ## -edit = sed \ - -e 's|@SHELL[@]|$(SHELL)|g' \ - -e 's|@PERL[@]|$(PERL)|g' \ - -e 's|@PERL_FLOCK[@]|$(PERL_FLOCK)|g' \ - -e 's|@bindir[@]|$(bindir)|g' \ - -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \ - -e 's|@prefix[@]|$(prefix)|g' \ - -e 's|@autoconf-name[@]|'`echo autoconf | sed '$(transform)'`'|g' \ - -e 's|@autoheader-name[@]|'`echo autoheader | sed '$(transform)'`'|g' \ - -e 's|@autom4te-name[@]|'`echo autom4te | sed '$(transform)'`'|g' \ - -e 's|@M4[@]|$(M4)|g' \ - -e 's|@M4_DEBUGFILE[@]|$(M4_DEBUGFILE)|g' \ - -e 's|@M4_GNU[@]|$(M4_GNU)|g' \ - -e 's|@AWK[@]|$(AWK)|g' \ - -e 's|@RELEASE_YEAR[@]|$(RELEASE_YEAR)|g' \ - -e 's|@VERSION[@]|$(VERSION)|g' \ - -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ - -e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g' - # autoconf is written in M4sh. # FIXME: this target should depend on the frozen files below lib/m4sugar, # otherwise autom4te may pick up a frozen m4sh.m4f from an earlier |