[Parted-commits] GNU Parted Official Repository: Changes to 'master'

Jim Meyering meyering at alioth.debian.org
Thu Aug 30 18:11:15 UTC 2012 

 bootstrap.conf               |    6 +++---
 configure.ac                 |    3 ++-
 include/parted/Makefile.am   |    3 +--
 libparted/Makefile.am        |    2 +-
 libparted/fs/Makefile.am     |    4 +---
 libparted/labels/Makefile.am |    8 +++++---
 parted/Makefile.am           |    2 +-
 partprobe/Makefile.am        |    2 +-
 tests/Makefile.am            |    7 +------
 9 files changed, 16 insertions(+), 21 deletions(-)

New commits:
commit 0406b2ce14fb86ede506c51d6b603b1f4a1ff42d
Author: Stefano Lattarini <stefano.lattarini at gmail.com>
Date:   Thu Aug 30 18:53:21 2012 +0200

    maint: tighten per version requirement
    
    * bootstrap.conf ($buildreq): Require Perl >= 5.6 (not merely >= 5.5),
    because that's the minimal version required by modern Automake and
    Autoconf.
    
    Copyright-paperwork-exempt: yes

diff --git a/bootstrap.conf b/bootstrap.conf
index a5d5910..7f4ee53 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -138,7 +138,7 @@ git        1.4.4
 gperf      3.0.3
 gzip       -
 makeinfo   -
-perl       5.5
+perl       5.6
 rsync      -
 tar        -
 "

commit c7c9978f0bbf05517437ccc76ea8eff5d811aaef
Author: Stefano Lattarini <stefano.lattarini at gmail.com>
Date:   Thu Aug 30 18:53:20 2012 +0200

    maint: make Autoconf version requirement consistent
    
    * bootstrap.conf ($buildreq): Require Autoconf >= 2.63, not >= 2.61,
    for consistency with what is done in AC_INIT in configure.ac
    
    Copyright-paperwork-exempt: yes

diff --git a/bootstrap.conf b/bootstrap.conf
index 39a5506..a5d5910 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -129,7 +129,7 @@ mkdir -p gnulib-tests
 
 # Build prerequisites
 buildreq="\
-autoconf   2.61
+autoconf   2.63
 automake   1.11.6
 autopoint  -
 bc         -

commit b2338d71549462c1dfbb434111b5c46701f54261
Author: Stefano Lattarini <stefano.lattarini at gmail.com>
Date:   Thu Aug 30 18:53:19 2012 +0200

    build: require Automake >= 1.11.6
    
    Now that we use AM_TESTS_ENVIRONMENT, we should require at least
    Automake >= 1.11.2; but since all the Automake version until 1.11.5
    are vulnerable to CVE-2012-3386:
    
        <https://lists.gnu.org/archive/html/automake/2012-07/msg00023.html>
    
    it's even better to require 1.11.6.
    
    * configure.ac (AM_INIT_AUTOMAKE): Bump version requirement to 1.11.6.
    * bootstrap.conf ($buildreq): Likewise.
    
    Copyright-paperwork-exempt: yes

diff --git a/bootstrap.conf b/bootstrap.conf
index b4456b2..39a5506 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -130,7 +130,7 @@ mkdir -p gnulib-tests
 # Build prerequisites
 buildreq="\
 autoconf   2.61
-automake   1.11
+automake   1.11.6
 autopoint  -
 bc         -
 gettext    -
diff --git a/configure.ac b/configure.ac
index 49ef75c..832fc20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ AC_SUBST([LT_CURRENT])
 AC_SUBST([LT_REVISION])
 AC_SUBST([LT_AGE])
 
-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz color-tests parallel-tests
+AM_INIT_AUTOMAKE([1.11.6 no-dist-gzip dist-xz color-tests parallel-tests
                   subdir-objects])
 AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
 

commit af4d0f5706740848c3fef67a7ea0b78cf31ddb90
Author: Stefano Lattarini <stefano.lattarini at gmail.com>
Date:   Thu Aug 30 18:53:18 2012 +0200

    tests: remove unused AM_TESTS_ENVIRONMENT entries
    
    Probably a copy&paste errors, likely from the TESTS_ENVIRONMENT
    definition in the 'tests/Makefile.am' in GNU coreutils.
    
    * tests/Makefile.am (AM_TESTS_ENVIRONMENT): Don't define nor export
    any of the variables PREFERABLY_POSIX_SHELL, REPLACE_GETCWD, CC,
    MAKE, PERL.
    
    Copyright-paperwork-exempt: yes

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 33e8f8e..c97400b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -107,16 +107,11 @@ AM_TESTS_ENVIRONMENT =				\
   srcdir='$(srcdir)'				\
   top_srcdir='$(top_srcdir)'			\
   AWK='$(AWK)'					\
-  CC='$(CC)'					\
-  MAKE=$(MAKE)					\
   PACKAGE_BUGREPORT='$(PACKAGE_BUGREPORT)'	\
   PACKAGE_VERSION=$(PACKAGE_VERSION)		\
   CONFIG_HEADER='$(abs_top_builddir)/lib/config.h' \
   ENABLE_DEVICE_MAPPER=$(ENABLE_DEVICE_MAPPER)	\
   PARTED_TEST_NAME=`basename '$(abs_srcdir)'`,`echo $$tst|sed 's,^\./,,;s,/,-,g'`\
-  PERL='$(PERL)'				\
-  PREFERABLY_POSIX_SHELL='$(PREFERABLY_POSIX_SHELL)' \
-  REPLACE_GETCWD=$(REPLACE_GETCWD)		\
   PATH='$(abs_top_builddir)/parted$(PATH_SEPARATOR)'"$$PATH" \
   VERSION=$(VERSION)				\
   ; 9>&2

commit 2bd66d7d3e5a1924c65c051d4b639c5ab48bbb99
Author: Stefano Lattarini <stefano.lattarini at gmail.com>
Date:   Thu Aug 30 18:53:17 2012 +0200

    tests: prefer AM_TESTS_ENVIRONMENT over TESTS_ENVIRONMENT
    
    The latter should be reserved for user overrides.
    
    * tests/Makefile.am (TESTS_ENVIRONMENT): Rename ...
    (AM_TESTS_ENVIRONMENT): ... like this.
    
    Copyright-paperwork-exempt: yes

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1264812..33e8f8e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -96,7 +96,7 @@ sep = $(PATH_SEPARATOR)
 # variables that can perturb tests are unset or set to expected values.
 # The rest are envvar settings that propagate build-related Makefile
 # variables to test scripts.
-TESTS_ENVIRONMENT =				\
+AM_TESTS_ENVIRONMENT =				\
   tmp__=$$TMPDIR; test -d "$$tmp__" || tmp__=.;	\
   TMPDIR=$$tmp__; export TMPDIR;		\
   export					\

commit 803b2f58760ed82e5eb182df75ba18c00c9f43bf
Author: Stefano Lattarini <stefano.lattarini at gmail.com>
Date:   Thu Aug 30 18:53:16 2012 +0200

    build: enable subdir-objects Automake option globally
    
    That option is enabled unconditionally in Automake-NG, and enabling
    it also for mainline Automake will help to ensure no unexpected
    incompatibilities is introduced in a potential port to Automake-NG.
    
    Moreover, if we have a source file 'sub/foo.c', having it compiled
    in 'sub/foo.o' rather than in 'foo.o' is undeniably cleaner and more
    natural.
    
    * configure.ac (AM_INIT_AUTOMAKE): Add 'subdir-objects'.
    * libparted/fs/Makefile.am (AUTOMAKE_OPTIONS): No need to declare
    'subdir-objects' explicitly now.
    
    Copyright-paperwork-exempt: yes

diff --git a/configure.ac b/configure.ac
index 1444279..49ef75c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,8 @@ AC_SUBST([LT_CURRENT])
 AC_SUBST([LT_REVISION])
 AC_SUBST([LT_AGE])
 
-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz color-tests parallel-tests])
+AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz color-tests parallel-tests
+                  subdir-objects])
 AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
 
 AC_CANONICAL_HOST
diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
index 7fe364a..064f11a 100644
--- a/libparted/fs/Makefile.am
+++ b/libparted/fs/Makefile.am
@@ -3,8 +3,6 @@
 #
 # This file may be modified and/or distributed without restriction.
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include
 
 AM_CFLAGS = $(WARN_CFLAGS)

commit 904a8d31d2906e8e653d670e508c4c6bd4b264c1
Author: Stefano Lattarini <stefano.lattarini at gmail.com>
Date:   Thu Aug 30 18:53:15 2012 +0200

    build: prefer pattern rules over suffix rules
    
    That is acceptable, because the GNU parted build system already
    requires GNU make anyway: the $(subst ...) built-in is used in the
    common recipe for the 'ss-1024', 'ss-2048' and 'ss-4096' targets
    in Makefile.am.
    
    * include/parted/Makefile.am (.in.h.h): Rename ...
    (%.h: %.in.h): ... as this pattern rule.
    (SUFFIXES): Delete, no more needed.
    
    Copyright-paperwork-exempt: yes

diff --git a/include/parted/Makefile.am b/include/parted/Makefile.am
index 19236f0..6f808c6 100644
--- a/include/parted/Makefile.am
+++ b/include/parted/Makefile.am
@@ -44,8 +44,7 @@ subst_pure_attr = \
 
 $(BUILT_SOURCES): Makefile.am
 
-SUFFIXES = .in.h .h
-.in.h.h:
+%.h: %.in.h
 	$(AM_V_GEN)rm -f $@ $@-t
 	$(AM_V_at)perl -p \
 	    -e '$(subst_const_attr);' \

commit 605c53ad0f209b9f62a15c3f89a9930860153489
Author: Stefano Lattarini <stefano.lattarini at gmail.com>
Date:   Thu Aug 30 18:53:14 2012 +0200

    build: don't list files with unknown suffix in _SOURCES
    
    While this works with mainline Automake (which blindly treats source
    files with an unknown extension as if they were header files), it is
    undocumented (albeit admittedly unlikely to change).  Moreover, it no
    longer works with Automake-NG (and that's by design), so the use of
    such feature would make a port to Automake-NG more difficult.
    
    * libparted/labels/Makefile.am (liblabels_la_SOURCES): ... don't
    list 'pt-limit.gperf' here; rather ...
    (EXTRA_DIST): ... list 'pt-limit.c' and 'pt-limit.gperf' here.
    (EXTRA_DIST, BUILT_SOURCES): Enhance few comments.
    
    Copyright-paperwork-exempt: yes

diff --git a/libparted/labels/Makefile.am b/libparted/labels/Makefile.am
index ec8abeb..f4e4d27 100644
--- a/libparted/labels/Makefile.am
+++ b/libparted/labels/Makefile.am
@@ -39,10 +39,11 @@ liblabels_la_LIBADD = $(OS_LIBS) $(INTLLIBS)
 
 AM_CPPFLAGS = $(partedincludedir) $(INTLINCS)
 
+# Included by 'pt-tools.c', so needs to be built early.
 BUILT_SOURCES = pt-limit.c
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
-liblabels_la_SOURCES += pt-limit.gperf
-EXTRA_DIST = $(BUILT_SOURCES)
+# DOn't add this to '_SOURCES', because it's not to be compiled!
+EXTRA_DIST= pt-limit.c
 
 GPERF = gperf
 GPERF_OPTIONS = \
@@ -55,3 +56,4 @@ pt-limit.c: pt-limit.gperf
 	  > $@-tmp
 	chmod a-w $@-tmp
 	mv $@-tmp $@
+EXTRA_DIST += pt-limit.gperf

commit a185e958b5614ea7e606e85d3de879c5ffc127c0
Author: Stefano Lattarini <stefano.lattarini at gmail.com>
Date:   Thu Aug 30 18:53:13 2012 +0200

    build: prefer $(AM_CPPFLAGS) over $(INCLUDES)
    
    The latter is obsolete, and might be removed in future Automake versions.
    Moreover, it's already been removed in Automake-NG, so its use would make
    a port to Automake-NG more difficult.
    
    * parted/Makefile.am (INCLUDES): Rename ...
    (AM_CPPFLAGS): ... like this.
    * partprobe/Makefile.am: Likewise.
    * libparted/fs/Makefile.am: Likewise.
    * libparted/Makefile.am: Likewise.
    * libparted/labels/Makefile.am: Likewise.
    
    Copyright-paperwork-exempt: yes

diff --git a/libparted/Makefile.am b/libparted/Makefile.am
index 7cf35b2..bdc7976 100644
--- a/libparted/Makefile.am
+++ b/libparted/Makefile.am
@@ -62,4 +62,4 @@ libparted_la_LIBADD =	\
 
 EXTRA_DIST	      = mbr.s
 
-INCLUDES = $(partedincludedir) $(INTLINCS)
+AM_CPPFLAGS = $(partedincludedir) $(INTLINCS)
diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
index 8d48ea1..7fe364a 100644
--- a/libparted/fs/Makefile.am
+++ b/libparted/fs/Makefile.am
@@ -114,7 +114,7 @@ libparted_fs_resize_la_SOURCES = \
   r/hfs/reloc_plus.c		\
   r/hfs/reloc_plus.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
   -I$(top_srcdir)/libparted/labels	\
   $(partedincludedir)			\
   $(INTLINCS)
diff --git a/libparted/labels/Makefile.am b/libparted/labels/Makefile.am
index 7fe347b..ec8abeb 100644
--- a/libparted/labels/Makefile.am
+++ b/libparted/labels/Makefile.am
@@ -37,7 +37,7 @@ liblabels_la_SOURCES = \
 
 liblabels_la_LIBADD = $(OS_LIBS) $(INTLLIBS)
 
-INCLUDES = $(partedincludedir) $(INTLINCS)
+AM_CPPFLAGS = $(partedincludedir) $(INTLINCS)
 
 BUILT_SOURCES = pt-limit.c
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
diff --git a/parted/Makefile.am b/parted/Makefile.am
index 0b23693..e7bba2e 100644
--- a/parted/Makefile.am
+++ b/parted/Makefile.am
@@ -48,6 +48,6 @@ parted_LDFLAGS = $(PARTEDLDFLAGS)
 # Tell the linker to omit references to unused shared libraries.
 parted_LDFLAGS += $(IGNORE_UNUSED_LIBRARIES_CFLAGS)
 
-INCLUDES	= $(partedincludedir) $(INTLINCS)
+AM_CPPFLAGS = $(partedincludedir) $(INTLINCS)
 
 MAINTAINERCLEANFILES += Makefile.in
diff --git a/partprobe/Makefile.am b/partprobe/Makefile.am
index dbe2c9f..c0304a0 100644
--- a/partprobe/Makefile.am
+++ b/partprobe/Makefile.am
@@ -13,4 +13,4 @@ partprobe_LDADD = \
 
 partprobe_LDFLAGS = $(PARTEDLDFLAGS)
 
-INCLUDES	= $(partedincludedir) $(INTLINCS)
+AM_CPPFLAGS = $(partedincludedir) $(INTLINCS)

More information about the Parted-commits mailing list