Mercurial > hg > octave-nkf > gnulib-hg
changeset 17396:9815ae1c3b4f
deps: require Automake >= 1.9.6 in generated Makefile fragments
That is the same minimal version required in the DEPENDENCIES file.
Moreover, the old code generated a requirement of Automake >= 1.5,
and that is an insanely outdated version.
* gnulib-tool: Bump minimal version requirement in AUTOMAKE_OPTIONS.
* tests/havelib/rpathlx/Makefile.am: Likewise.
* tests/havelib/rpathly/Makefile.am: Likewise.
* tests/havelib/rpathlyx/Makefile.am: Likewise.
* tests/havelib/rpathlz/Makefile.am: Likewise.
* tests/havelib/rpathlzyx/Makefile.am: Likewise.
* tests/havelib/rpathx/Makefile.am: Likewise.
* tests/havelib/rpathy/Makefile.am: Likewise.
* tests/havelib/rpathz/Makefile.am: Likewise.
author | Stefano Lattarini <stefano.lattarini@gmail.com> |
---|---|
date | Fri, 10 May 2013 22:13:04 +0200 |
parents | bffc406a6390 |
children | 70c2a43965ef |
files | ChangeLog gnulib-tool tests/havelib/rpathlx/Makefile.am tests/havelib/rpathly/Makefile.am tests/havelib/rpathlyx/Makefile.am tests/havelib/rpathlz/Makefile.am tests/havelib/rpathlzyx/Makefile.am tests/havelib/rpathx/Makefile.am tests/havelib/rpathy/Makefile.am tests/havelib/rpathz/Makefile.am |
diffstat | 10 files changed, 30 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2012-05-10 Stefano Lattarini <stefano.lattarini@gmail.com> + + deps: require Automake >= 1.9.6 in generated Makefile fragments + + That is the same minimal version required in the DEPENDENCIES file. + Moreover, the old code generated a requirement of Automake >= 1.5, + and that is an insanely outdated version. + + * gnulib-tool: Bump minimal version requirement in AUTOMAKE_OPTIONS. + * tests/havelib/rpathlx/Makefile.am: Likewise. + * tests/havelib/rpathly/Makefile.am: Likewise. + * tests/havelib/rpathlyx/Makefile.am: Likewise. + * tests/havelib/rpathlz/Makefile.am: Likewise. + * tests/havelib/rpathlzyx/Makefile.am: Likewise. + * tests/havelib/rpathx/Makefile.am: Likewise. + * tests/havelib/rpathy/Makefile.am: Likewise. + * tests/havelib/rpathz/Makefile.am: Likewise. + 2013-05-08 Eric Blake <eblake@redhat.com> bootstrap: AC_INIT may have more than four parameters
--- a/gnulib-tool +++ b/gnulib-tool @@ -3334,7 +3334,7 @@ if test -n "$uses_subdirs"; then subdir_options=' subdir-objects' fi - echo "AUTOMAKE_OPTIONS = 1.5 gnits${subdir_options}" + echo "AUTOMAKE_OPTIONS = 1.9.6 gnits${subdir_options}" fi echo if test -z "$makefile_name"; then @@ -3643,7 +3643,7 @@ if test -n "$uses_subdirs"; then subdir_options=' subdir-objects' fi - echo "AUTOMAKE_OPTIONS = 1.5 foreign${subdir_options}" + echo "AUTOMAKE_OPTIONS = 1.9.6 foreign${subdir_options}" echo if $for_test && ! $single_configure; then echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}" @@ -5888,7 +5888,7 @@ # Create Makefile.am. (echo "## Process this file with automake to produce Makefile.in." echo - echo "AUTOMAKE_OPTIONS = 1.5 foreign" + echo "AUTOMAKE_OPTIONS = 1.9.6 foreign" echo echo "SUBDIRS = $subdirs" echo @@ -6197,7 +6197,7 @@ # Create Makefile.am. (echo "## Process this file with automake to produce Makefile.in." echo - echo "AUTOMAKE_OPTIONS = 1.5 foreign" + echo "AUTOMAKE_OPTIONS = 1.9.6 foreign" echo echo "SUBDIRS = $megasubdirs" echo
--- a/tests/havelib/rpathlx/Makefile.am +++ b/tests/havelib/rpathlx/Makefile.am @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies +AUTOMAKE_OPTIONS = 1.9.6 foreign no-dependencies bin_PROGRAMS = usex usex_SOURCES = usex.c LDADD = @LIBRPATHX@
--- a/tests/havelib/rpathly/Makefile.am +++ b/tests/havelib/rpathly/Makefile.am @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies +AUTOMAKE_OPTIONS = 1.9.6 foreign no-dependencies bin_PROGRAMS = usey usey_SOURCES = usey.c LDADD = @LIBRPATHY@
--- a/tests/havelib/rpathlyx/Makefile.am +++ b/tests/havelib/rpathlyx/Makefile.am @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies +AUTOMAKE_OPTIONS = 1.9.6 foreign no-dependencies bin_PROGRAMS = usey usey_SOURCES = usey.c LDADD = @LIBRPATHY@
--- a/tests/havelib/rpathlz/Makefile.am +++ b/tests/havelib/rpathlz/Makefile.am @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies +AUTOMAKE_OPTIONS = 1.9.6 foreign no-dependencies bin_PROGRAMS = usez usez_SOURCES = usez.c LDADD = @LIBRPATHZ@
--- a/tests/havelib/rpathlzyx/Makefile.am +++ b/tests/havelib/rpathlzyx/Makefile.am @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies +AUTOMAKE_OPTIONS = 1.9.6 foreign no-dependencies bin_PROGRAMS = usez usez_SOURCES = usez.c LDADD = @LIBRPATHZ@
--- a/tests/havelib/rpathx/Makefile.am +++ b/tests/havelib/rpathx/Makefile.am @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies +AUTOMAKE_OPTIONS = 1.9.6 foreign no-dependencies lib_LTLIBRARIES = librpathx.la librpathx_la_SOURCES = rpathx.c librpathx_la_LDFLAGS = -lc -no-undefined
--- a/tests/havelib/rpathy/Makefile.am +++ b/tests/havelib/rpathy/Makefile.am @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies +AUTOMAKE_OPTIONS = 1.9.6 foreign no-dependencies lib_LTLIBRARIES = librpathy.la librpathy_la_SOURCES = rpathy.c librpathy_la_LDFLAGS = @LTLIBRPATHX@ -lc -no-undefined
--- a/tests/havelib/rpathz/Makefile.am +++ b/tests/havelib/rpathz/Makefile.am @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies +AUTOMAKE_OPTIONS = 1.9.6 foreign no-dependencies lib_LTLIBRARIES = librpathz.la librpathz_la_SOURCES = rpathz.c librpathz_la_LDFLAGS = @LTLIBRPATHX@ @LTLIBRPATHY@ -lc -no-undefined