[PATCH] libparted: link with gnulib

[Jim Meyering]

* libparted/Makefile.am (libparted_la_LIBADD): Add
$(top_builddir)/lib/libparted.la to the list.
* partprobe/Makefile.am (partprobe_LDADD): Remove now-unneeded
$(top_builddir)/lib/libparted.la.
Otavio Salvador reported that linking with the resulting shared
library produced an unresolved reference to last_component.
---
 libparted/Makefile.am |   18 ++++++++++--------
 partprobe/Makefile.am |    1 -
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/libparted/Makefile.am b/libparted/Makefile.am
index 6f52193..25259dd 100644
--- a/libparted/Makefile.am
+++ b/libparted/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of GNU Parted
-# Copyright (C) 1999, 2000, 2001, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2007, 2009 Free Software Foundation, Inc.
 #
 # This file may be modified and/or distributed without restriction.

@@ -36,13 +36,15 @@ EXTRA_libparted_la_SOURCES    = arch/linux.c		\
 				arch/gnu.c \
 				arch/beos.c

-libparted_la_LIBADD   = $(OS_LIBS)		\
-			$(DL_LIBS)		\
-			$(DM_LIBS)		\
-			$(SELINUX_LIBS)		\
-			$(INTLLIBS)		\
-			fs/libfs.la		\
-			labels/liblabels.la
+libparted_la_LIBADD =	\
+  fs/libfs.la		\
+  labels/liblabels.la	\
+  $(top_builddir)/lib/libparted.la \
+  $(OS_LIBS)		\
+  $(DL_LIBS)		\
+  $(DM_LIBS)		\
+  $(SELINUX_LIBS)	\
+  $(INTLLIBS)

 EXTRA_DIST	      = mbr.s

diff --git a/partprobe/Makefile.am b/partprobe/Makefile.am
index ec6371c..9d1a4d5 100644
--- a/partprobe/Makefile.am
+++ b/partprobe/Makefile.am
@@ -6,7 +6,6 @@ partprobe_SOURCES = partprobe.c

 partprobe_LDADD = \
   $(top_builddir)/libparted/libparted.la \
-  $(top_builddir)/lib/libparted.la \
   $(INTLLIBS) $(LIBS) \
   $(PARTED_LIBS)

--
1.6.3.1.308.g426b5