From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Thu, 27 Apr 2017 07:12:28 +0000 (+0200)
Subject: build-sys: don't use non-existing UUID_LIBS
X-Git-Tag: v2.31-rc1~189
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21be08ac8cf887d982cf0944714659a3ce92345b;p=thirdparty%2Futil-linux.git

build-sys: don't use non-existing UUID_LIBS

We've added UUID_LIBS in f77a4d1087 but I don't see what it
was good for.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
index ed80222ec2..aecfa4bb2d 100644
--- a/libblkid/src/Makemodule.am
+++ b/libblkid/src/Makemodule.am
@@ -157,7 +157,7 @@ blkid_tests_ldadd   = libblkid.la
 
 if BUILD_LIBUUID
 blkid_tests_ldflags += libuuid.la
-blkid_tests_ldadd   += $(LDADD) $(UUID_LIBS)
+blkid_tests_ldadd   += $(LDADD)
 endif
 
 blkid_tests_ldflags += -static
diff --git a/libfdisk/src/Makemodule.am b/libfdisk/src/Makemodule.am
index 9ebfa650f3..b51de58f45 100644
--- a/libfdisk/src/Makemodule.am
+++ b/libfdisk/src/Makemodule.am
@@ -78,7 +78,7 @@ check_PROGRAMS += \
 
 libfdisk_tests_cflags  = -DTEST_PROGRAM $(libfdisk_la_CFLAGS) $(NO_UNUSED_WARN_CFLAGS)
 libfdisk_tests_ldflags = libuuid.la -static
-libfdisk_tests_ldadd   = libfdisk.la $(LDADD) $(UUID_LIBS)
+libfdisk_tests_ldadd   = libfdisk.la $(LDADD)
 
 if BUILD_LIBBLKID
 libfdisk_tests_ldflags += libblkid.la
diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am
index af4a9210ef..e5861b0baf 100644
--- a/libmount/src/Makemodule.am
+++ b/libmount/src/Makemodule.am
@@ -89,7 +89,7 @@ endif
 
 libmount_tests_cflags  = -DTEST_PROGRAM $(libmount_la_CFLAGS) $(NO_UNUSED_WARN_CFLAGS)
 libmount_tests_ldflags = libblkid.la -static
-libmount_tests_ldadd   = libmount.la $(LDADD) $(UUID_LIBS) $(REALTIME_LIBS)
+libmount_tests_ldadd   = libmount.la $(LDADD) $(REALTIME_LIBS)
 
 if HAVE_SELINUX
 libmount_tests_ldadd += $(SELINUX_LIBS)