From: Stefano Lattarini Date: Fri, 10 May 2013 11:33:52 +0000 (+0200) Subject: Merge branch 'maint' X-Git-Tag: v1.16~100 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dd95c8d51099aaca08fab7815e2c536908250e2;p=thirdparty%2Fautomake.git Merge branch 'maint' * maint: automake: typofix in comments: s/AC_CONFIG_HEADER/AC_CONFIG_HEADERS/ am: prefer a shorter idiom where possible cosmetics: fix few typos, grammaros and missing whitespace fixup: remove an obsolete comment docs: we still don't have the promised better Java interface build: move automake and aclocal in 'bin' subdir build: break up monolithic Makefile.am in subdir-specific fragments + Extra non-trivial edits: * m4/Makefile.inc (dist_automake_ac_DATA): Drop lead-dot.m4 and mkdirp.m4. * lib/Automake/Makefile.inc (dist_perllib_DATA): Drop Configure_ac.pm. Signed-off-by: Stefano Lattarini --- 0dd95c8d51099aaca08fab7815e2c536908250e2 diff --cc configure.ac index 497c2b7a1,1a0620ff0..358208910 --- a/configure.ac +++ b/configure.ac @@@ -16,9 -16,9 +16,9 @@@ # along with this program. If not, see . AC_PREREQ([2.69]) -AC_INIT([GNU Automake], [1.13a], [bug-automake@gnu.org]) +AC_INIT([GNU Automake], [1.99a], [bug-automake@gnu.org]) - AC_CONFIG_SRCDIR([automake.in]) + AC_CONFIG_SRCDIR([bin/automake.in]) AC_CONFIG_AUX_DIR([lib]) AM_SILENT_RULES([yes]) diff --cc lib/Automake/Makefile.inc index 000000000,48b15231f..051915656 mode 000000,100644..100644 --- a/lib/Automake/Makefile.inc +++ b/lib/Automake/Makefile.inc @@@ -1,0 -1,57 +1,56 @@@ + ## Included by top-level Makefile for Automake. + + ## Copyright (C) 1995-2013 Free Software Foundation, Inc. + ## + ## This program is free software; you can redistribute it and/or modify + ## it under the terms of the GNU General Public License as published by + ## the Free Software Foundation; either version 2, or (at your option) + ## any later version. + ## + ## This program is distributed in the hope that it will be useful, + ## but WITHOUT ANY WARRANTY; without even the implied warranty of + ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ## GNU General Public License for more details. + ## + ## You should have received a copy of the GNU General Public License + ## along with this program. If not, see . + + ## ---------------------------------------------------- ## + ## Private perl modules used by automake and aclocal. ## + ## ---------------------------------------------------- ## + + perllibdir = $(pkgvdatadir)/Automake + + dist_perllib_DATA = \ + %D%/ChannelDefs.pm \ + %D%/Channels.pm \ + %D%/Condition.pm \ - %D%/Configure_ac.pm \ + %D%/DisjConditions.pm \ + %D%/FileUtils.pm \ + %D%/General.pm \ + %D%/Getopt.pm \ + %D%/Item.pm \ + %D%/ItemDef.pm \ + %D%/Language.pm \ + %D%/Location.pm \ + %D%/Options.pm \ + %D%/Rule.pm \ + %D%/RuleDef.pm \ + %D%/Variable.pm \ + %D%/VarDef.pm \ + %D%/Version.pm \ + %D%/XFile.pm \ + %D%/Wrap.pm + + nodist_perllib_DATA = %D%/Config.pm + CLEANFILES += $(nodist_perllib_DATA) + + %D%/Config.pm: %D%/Config.in Makefile + $(AM_V_at)rm -f $@ $@-t + $(AM_V_at)$(MKDIR_P) %D% + $(AM_V_GEN)in=Config.in \ + && $(do_subst) <$(srcdir)/%D%/Config.in >$@-t + $(generated_file_finalize) + EXTRA_DIST += %D%/Config.in + + # vim: ft=automake noet diff --cc m4/Makefile.inc index 000000000,11874e731..ac7067df7 mode 000000,100644..100644 --- a/m4/Makefile.inc +++ b/m4/Makefile.inc @@@ -1,0 -1,79 +1,77 @@@ + ## Included by top-level Makefile for Automake. + + ## Copyright (C) 1995-2013 Free Software Foundation, Inc. + ## + ## This program is free software; you can redistribute it and/or modify + ## it under the terms of the GNU General Public License as published by + ## the Free Software Foundation; either version 2, or (at your option) + ## any later version. + ## + ## This program is distributed in the hope that it will be useful, + ## but WITHOUT ANY WARRANTY; without even the implied warranty of + ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ## GNU General Public License for more details. + ## + ## You should have received a copy of the GNU General Public License + ## along with this program. If not, see . + + ## ------------------------------ ## + ## Automake-provided m4 macros. ## + ## ------------------------------ ## + + system_acdir = @system_acdir@ + automake_acdir = @automake_acdir@ + + dist_automake_ac_DATA = \ + %D%/amversion.m4 \ + %D%/ar-lib.m4 \ + %D%/as.m4 \ + %D%/auxdir.m4 \ + %D%/cond.m4 \ + %D%/cond-if.m4 \ + %D%/depend.m4 \ + %D%/depout.m4 \ + %D%/dmalloc.m4 \ + %D%/extra-recurs.m4 \ + %D%/gcj.m4 \ + %D%/init.m4 \ + %D%/install-sh.m4 \ - %D%/lead-dot.m4 \ + %D%/lex.m4 \ + %D%/lispdir.m4 \ + %D%/maintainer.m4 \ + %D%/make.m4 \ + %D%/minuso.m4 \ + %D%/missing.m4 \ - %D%/mkdirp.m4 \ + %D%/obsolete.m4 \ + %D%/options.m4 \ + %D%/python.m4 \ + %D%/runlog.m4 \ + %D%/sanity.m4 \ + %D%/silent.m4 \ + %D%/strip.m4 \ + %D%/substnot.m4 \ + %D%/tar.m4 \ + %D%/upc.m4 \ + %D%/vala.m4 + + dist_system_ac_DATA = %D%/acdir/README + + automake_internal_acdir = $(automake_acdir)/internal + dist_automake_internal_ac_DATA = %D%/internal/ac-config-macro-dirs.m4 + + # We build amversion.m4 here, instead of from config.status, + # because config.status is rerun each time one of configure's + # dependencies change and amversion.m4 happens to be a configure + # dependency. configure and amversion.m4 would be rebuilt in + # loop otherwise. + # Use '$(top_srcdir)' for the benefit of non-GNU makes: this is + # how amversion.m4 appears in our dependencies. + $(top_srcdir)/%D%/amversion.m4: $(srcdir)/configure.ac \ + $(srcdir)/%D%/amversion.in + $(AM_V_at)rm -f $@-t $@ + $(AM_V_GEN)in=amversion.in \ + && $(do_subst) <$(srcdir)/%D%/amversion.in >$@-t + $(generated_file_finalize) + EXTRA_DIST += %D%/amversion.in + + # vim: ft=automake noet diff --cc maintainer/syntax-checks.mk index 6614820df,61fcef3b9..6cfa603c2 --- a/maintainer/syntax-checks.mk +++ b/maintainer/syntax-checks.mk @@@ -80,11 -80,13 +80,13 @@@ sc_tabs_in_texi sc_at_in_texi ## These check avoids accidental configure substitutions in the source. -## There are exactly 8 lines that should be modified from automake.in to +## There are exactly 7 lines that should be modified from automake.in to ## automake, and 9 lines that should be modified from aclocal.in to ## aclocal. -automake_diff_no = 8 +automake_diff_no = 7 aclocal_diff_no = 9 + sc_diff_automake sc_diff_aclocal: in=$($*_in) + sc_diff_automake sc_diff_aclocal: out=$($*_script) sc_diff_automake sc_diff_aclocal: sc_diff_% : @set +e; \ in=$*-in.tmp out=$*-out.tmp diffs=$*-diffs.tmp \