summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuediger Meier2017-04-27 09:12:28 +0200
committerRuediger Meier2017-07-18 11:06:53 +0200
commit21be08ac8cf887d982cf0944714659a3ce92345b (patch)
tree2e545c5a0163d25efe7b1867f09c36238d05ed48
parentlibfdisk: use fdisk_sector_t consistently and fix printf format strings (diff)
downloadkernel-qcow2-util-linux-21be08ac8cf887d982cf0944714659a3ce92345b.tar.gz
kernel-qcow2-util-linux-21be08ac8cf887d982cf0944714659a3ce92345b.tar.xz
kernel-qcow2-util-linux-21be08ac8cf887d982cf0944714659a3ce92345b.zip
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>
-rw-r--r--libblkid/src/Makemodule.am2
-rw-r--r--libfdisk/src/Makemodule.am2
-rw-r--r--libmount/src/Makemodule.am2
3 files changed, 3 insertions, 3 deletions
diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
index ed80222ec..aecfa4bb2 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 9ebfa650f..b51de58f4 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 af4a9210e..e5861b0ba 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)