libparted: link with gnulib

* 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.
* libparted/tests/Makefile.am (LDADD): Remove now-unneeded
$(top_builddir)/lib/libparted.la.
* debug/clearfat/Makefile.am (clearfat_LDADD): Likewise.
* parted/Makefile.am (parted_LDADD): Likewise.
Otavio Salvador reported that linking with the resulting shared
library produced an unresolved reference to last_component.

diff --git a/debug/clearfat/Makefile.am b/debug/clearfat/Makefile.am
index 318fba1..99c9348 100644 (file)
--- a/debug/clearfat/Makefile.am
+++ b/debug/clearfat/Makefile.am
@@ -4,7 +4,6 @@ clearfat_SOURCES = clearfat.c
 
 clearfat_LDADD = \
   $(top_builddir)/libparted/libparted.la \
-  $(top_builddir)/lib/libparted.la \
   $(INTLLIBS) $(LIBS) \
   $(PARTED_LIBS)
 

diff --git a/libparted/Makefile.am b/libparted/Makefile.am
index 6f52193..25259dd 100644 (file)
--- 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/libparted/tests/Makefile.am b/libparted/tests/Makefile.am
index cde1602..197b02d 100644 (file)
--- a/libparted/tests/Makefile.am
+++ b/libparted/tests/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of GNU Parted
-# Copyright (C) 1999-2001, 2007-2008 Free Software Foundation, Inc.
+# Copyright (C) 1999-2001, 2007-2009 Free Software Foundation, Inc.
 #
 # This file may be modified and/or distributed without restriction.
 
@@ -9,7 +9,6 @@ bin_PROGRAMS = label disk
 
 LDADD = \
   $(top_builddir)/libparted/libparted.la \
-  $(top_builddir)/lib/libparted.la \
   $(CHECK_LIBS)
 
 AM_CPPFLAGS = \

diff --git a/parted/Makefile.am b/parted/Makefile.am
index cb999b1..8c488dd 100644 (file)
--- a/parted/Makefile.am
+++ b/parted/Makefile.am
@@ -17,7 +17,6 @@ parted_CFLAGS = -DBUILDINFO=
 
 parted_LDADD = \
   $(top_builddir)/libparted/libparted.la \
-  $(top_builddir)/lib/libparted.la \
   $(INTLLIBS) $(LIBS) \
   $(PARTED_LIBS)
 

diff --git a/partprobe/Makefile.am b/partprobe/Makefile.am
index ec6371c..9d1a4d5 100644 (file)
--- 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)