[systemd-commits] 2 commits - Makefile.am

[Zbigniew Jędrzejewski-Szmek]

 Makefile.am |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 1dd5aa56d1cdf64397fba03b1d2ad63aaf281fe4
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Thu Apr 17 23:39:40 2014 -0400

    build-sys: do not try to build test-rtnl-manual w/o kmod

diff --git a/Makefile.am b/Makefile.am
index 6767a76..451e53a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1176,8 +1176,12 @@ manual_tests += \
 	test-install \
 	test-watchdog \
 	test-log \
-	test-ipcrm \
+	test-ipcrm
+
+if HAVE_KMOD
+manual_tests += \
 	test-rtnl-manual
+endif
 
 tests += \
 	test-job-type \

commit 7c4e5e4db829e1e2d22f2ff5fa04518ad1eb1787
Author: Łukasz Stelmach <l.stelmach at samsung.com>
Date:   Mon Apr 14 15:14:14 2014 +0200

    build-sys: add libkmod flags for test_rtnl_manual

diff --git a/Makefile.am b/Makefile.am
index 0ad1729..6767a76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1402,10 +1402,14 @@ test_ipcrm_LDADD = \
 test_rtnl_manual_SOURCES = \
 	src/test/test-rtnl-manual.c
 
+test_rtnl_manual_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(KMOD_CFLAGS)
+
 test_rtnl_manual_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-shared.la \
-	-lkmod
+	$(KMOD_LIBS)
 
 test_ellipsize_SOURCES = \
 	src/test/test-ellipsize.c