From: Ruediger Meier Date: Mon, 8 Feb 2016 12:53:17 +0000 (+0100) Subject: misc-utils: build test_uuidd only if BUILD_UUIDD X-Git-Tag: v2.28-rc1~106 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ec9bba2ca1688290d6a0008fa16b3a4c3047c22;p=thirdparty%2Futil-linux.git misc-utils: build test_uuidd only if BUILD_UUIDD Signed-off-by: Ruediger Meier --- diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am index 5ea27e1321..f49200312c 100644 --- a/misc-utils/Makemodule.am +++ b/misc-utils/Makemodule.am @@ -98,6 +98,11 @@ systemdsystemunit_DATA += \ misc-utils/uuidd.service \ misc-utils/uuidd.socket endif + +check_PROGRAMS += test_uuidd +test_uuidd_SOURCES = misc-utils/test_uuidd.c +test_uuidd_LDADD = $(LDADD) libcommon.la libuuid.la -lpthread +test_uuidd_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_incdir) endif # BUILD_UUIDD PATHFILES += \ diff --git a/tests/helpers/test_uuidd.c b/misc-utils/test_uuidd.c similarity index 100% rename from tests/helpers/test_uuidd.c rename to misc-utils/test_uuidd.c diff --git a/tests/helpers/Makemodule.am b/tests/helpers/Makemodule.am index 66d85ba074..0618e75786 100644 --- a/tests/helpers/Makemodule.am +++ b/tests/helpers/Makemodule.am @@ -15,8 +15,3 @@ check_PROGRAMS += test_sigreceive test_sigreceive_SOURCES = tests/helpers/test_sigreceive.c test_sigreceive_LDADD = $(LDADD) libcommon.la -check_PROGRAMS += test_uuidd -test_uuidd_SOURCES = tests/helpers/test_uuidd.c -test_uuidd_LDADD = $(LDADD) libcommon.la libuuid.la -lpthread -test_uuidd_CFLAGS = $(AM_CFLAGS) -I$(ul_libuuid_incdir) -