sd-dns: coding style cleanup

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7a159429e86e51c962c51e684374b5a5497fad5a..b4bb6e1e31a4304ea3e3c3936bbbded4693d7e9b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -494,7 +494,7 @@ EXTRA_DIST += \
        units/user/systemd-exit.service.in \
        units/systemd-fsck@.service.in \
        units/systemd-fsck-root.service.in \
-       units/user@.service.m4.in \
+       units/user@.service.in \
        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
@@ -665,6 +665,35 @@ test_rtnl_LDADD = \
 tests += \
        test-rtnl
 
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-dns.la
+
+libsystemd_dns_la_SOURCES = \
+       src/systemd/sd-dns.h \
+       src/libsystemd-bus/sd-dns.c \
+       src/libsystemd-bus/dns-util.h
+
+libsystemd_dns_la_LIBADD = \
+       libsystemd-shared.la
+
+libsystemd_dns_la_CFLAGS = \
+       -pthread
+
+test_dns_SOURCES = \
+       src/libsystemd-bus/test-dns.c \
+       src/systemd/sd-dns.h
+
+test_dns_LDADD = \
+       libsystemd-dns.la
+
+test_dns_LDFLAGS = \
+       -lresolv \
+       -pthread
+
+tests += \
+        test-dns
+
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-shared.la
@@ -1782,6 +1811,15 @@ systemd_dbus1_generator_LDADD = \
        libsystemd-shared.la \
        libsystemd-bus-internal.la
 
+dbus1-generator-install-hook:
+       $(AM_V_LN)$(LN_S) -f $(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
+
+dbus1-generator-uninstall-hook:
+       rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
+
+INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
+UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
+
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
        src/rc-local-generator/rc-local-generator.c
@@ -3767,7 +3805,8 @@ USER_UNIT_ALIASES += \
 endif
 
 EXTRA_DIST += \
-       units/systemd-bus-driverd.service.in
+       units/systemd-bus-driverd.service.in \
+       units/user/systemd-bus-driverd.service.in
 
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
@@ -4068,6 +4107,7 @@ systemd_networkd_LDADD = \
        libsystemd-id128-internal.la \
        libsystemd-rtnl.la \
        libsystemd-dhcp.la \
+       libsystemd-label.la \
        libsystemd-shared.la
 
 nodist_systemunit_DATA += \
@@ -4094,6 +4134,7 @@ test_network_LDADD = \
        libsystemd-daemon-internal.la \
        libsystemd-rtnl.la \
        libsystemd-dhcp.la \
+       libsystemd-label.la \
        libsystemd-shared.la
 
 tests += \
@@ -5042,3 +5083,7 @@ tests += \
 
 cppcheck:
        cppcheck --enable=all -q $(top_srcdir)
+
+# Used to extract compile flags for YCM.
+print-%:
+       @echo $($*)