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

[Jim Meyering]

 configure.ac             |    1 +
 libparted/Makefile.am    |   11 +++++------
 libparted/fs/Makefile.am |    4 +---
 3 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit f56bc2dfa852c399687c69dded419fa7a1be837b
Author: Jim Meyering <meyering at redhat.com>
Date:   Fri Jan 13 23:02:21 2012 +0100

    build: revert the recent "fix" to avoid make warnings about linux.lo
    
    It avoided the warning, but introduced a real problem
    when building from a clean directory.
    The real solution will have to wait, since it appears to
    depend on a fix in automake.
    
    This reverts commit a3c351c2d1cf2c0000bbc681959695c612bd19a0.

diff --git a/libparted/Makefile.am b/libparted/Makefile.am
index 6aeab5a..f8fbba5 100644
--- a/libparted/Makefile.am
+++ b/libparted/Makefile.am
@@ -44,11 +44,10 @@ libparted_la_SOURCES  = debug.c			\
 			$(ARCH_SOURCE)
 
 
-EXTRA_DIST = \
-  arch/linux.c	\
-  arch/linux.h	\
-  arch/gnu.c	\
-  arch/beos.c
+EXTRA_libparted_la_SOURCES    = arch/linux.c	\
+				arch/linux.h	\
+				arch/gnu.c	\
+				arch/beos.c
 
 libparted_la_LIBADD =	\
   fs/libfs.la		\
@@ -61,6 +60,6 @@ libparted_la_LIBADD =	\
   $(LIB_BLKID)		\
   $(INTLLIBS)
 
-EXTRA_DIST += mbr.s
+EXTRA_DIST	      = mbr.s
 
 INCLUDES = $(partedincludedir) $(INTLINCS)

commit 70e6e96d98f7fa4246eaac52fba75c10327ab403
Author: Jim Meyering <meyering at redhat.com>
Date:   Fri Jan 13 19:10:46 2012 +0100

    build: don't use -version for convenience libraries
    
    Don't use -release, either.  This avoids warnings from libtool.
    * libparted/fs/Makefile.am (libfs_la_LDFLAGS): Remove.

diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
index 30259f4..6339cfd 100644
--- a/libparted/fs/Makefile.am
+++ b/libparted/fs/Makefile.am
@@ -4,9 +4,7 @@
 # This file may be modified and/or distributed without restriction.
 
 partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include
-noinst_LTLIBRARIES    =	libfs.la
-libfs_la_LDFLAGS  = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-			-release $(LT_RELEASE)
+noinst_LTLIBRARIES =	libfs.la
 
 libfs_la_LIBADD   = $(UUID_LIBS)		\
 		    $(INTLLIBS)			\

commit c286b5779ec484de50a912f2b4128a1788a31cab
Author: Jim Meyering <meyering at redhat.com>
Date:   Fri Jan 13 19:03:48 2012 +0100

    build: use LT_INIT, to make bootstrap run libtoolize
    
    * configure.ac: Use LT_INIT, so that bootstrap runs libtoolize,
    which creates build-aux/ltmain.sh.

diff --git a/configure.ac b/configure.ac
index 82ffd4a..1444279 100644
--- a/configure.ac
+++ b/configure.ac
@@ -280,6 +280,7 @@ libraries.)
 	AM_DISABLE_SHARED
 fi
 AC_PROG_LIBTOOL
+LT_INIT
 
 AM_GNU_GETTEXT_VERSION([0.18])
 AM_GNU_GETTEXT([external])