condense assignment and path_kill_slashes calls

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 683f3f03c62f558f436933d4770146b70c9b85d4..90b9b93c63c7f78a445253490a7c1578f8f79e7f 100644 (file)
--- 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 \
@@ -1402,10 +1406,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
@@ -2587,8 +2595,7 @@ noinst_LTLIBRARIES += \
 
 libudev_internal_la_SOURCES =\
        $(libudev_la_SOURCES) \
-       src/libudev/libudev-device-private.c \
-       src/libudev/libudev-queue-private.c
+       src/libudev/libudev-device-private.c
 
 libudev_internal_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -4055,6 +4062,10 @@ libnss_myhostname_la_LDFLAGS = \
        -shared \
        -shrext .so.2
 
+libnss_myhostname_la_LIBADD = \
+       libsystemd-shared.la \
+       libsystemd-internal.la
+
 lib_LTLIBRARIES += \
        libnss_myhostname.la
 endif
@@ -5052,7 +5063,7 @@ hwdb-update:
 
 .PHONY: kdbus-update
 kdbus-update:
-       ( cd $(top_srcdir)/src/libsystemd/ && \
+       ( cd $(top_srcdir)/src/libsystemd/sd-bus/ && \
        wget -N https://d-bus.googlecode.com/git/kdbus.h )
 
 .PHONY: git-tag
@@ -5169,6 +5180,9 @@ test_libsystemd_sym_LDADD = \
 
 test_libudev_sym_SOURCES = \
        test-libudev-sym.c
+test_libudev_sym_CFLAGS = \
+       $(AM_CFLAGS) \
+       -Wno-deprecated-declarations
 test_libudev_sym_LDADD = \
        libudev.la