journalctl: allow globbing in --unit and --user-unit

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 725a37563a59edc5cfe1073348b7c36db5616fd9..8b3b81dacaeff796ac46d6967bb517a7f2fa58bb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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