X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=aa5580b8225d7a1a7022aff8ca75681227865ee5;hb=1401ec2d34bcde406ced531a72dc46ebaf332594;hp=0b46a128a7c7be7bd817e0b3fe58a10cea9644b5;hpb=5ac0162c3af95efa08a07b84ff62ad32842922c7;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 0b46a128a..aa5580b82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,6 +84,7 @@ sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
 varlogdir=$(localstatedir)/log
 systemdstatedir=$(localstatedir)/lib/systemd
 catalogstatedir=$(systemdstatedir)/catalog
+xinitrcdir=$(sysconfdir)/X11/xinit/xinitrc.d
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
@@ -1389,7 +1390,8 @@ tests += \
 	test-execute \
 	test-copy \
 	test-cap-list \
-	test-sigbus
+	test-sigbus \
+	test-verbs
 
 EXTRA_DIST += \
 	test/a.service \
@@ -1662,6 +1664,12 @@ test_tmpfiles_LDADD = \
 test_namespace_SOURCES = \
 	src/test/test-namespace.c
 
+test_verbs_SOURCES = \
+	src/test/test-verbs.c
+
+test_verbs_LDADD = \
+	libsystemd-shared.la
+
 test_namespace_LDADD = \
 	libsystemd-core.la
 
@@ -2467,6 +2475,9 @@ dbus1-generator-install-hook:
 dbus1-generator-uninstall-hook:
 	rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
 
+dist_xinitrc_SCRIPTS = \
+	xorg/50-systemd-user.sh
+
 INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
 UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
 endif
@@ -5053,6 +5064,7 @@ libsystemd_machine_core_la_SOURCES = \
 	src/machine/machine.h \
 	src/machine/machined-dbus.c \
 	src/machine/machine-dbus.c \
+	src/machine/machine-dbus.h \
 	src/machine/image-dbus.c \
 	src/machine/image-dbus.h
 
@@ -5070,6 +5082,8 @@ machinectl_SOURCES = \
 
 machinectl_LDADD = \
 	libsystemd-internal.la \
+	libsystemd-logs.la \
+	libsystemd-journal-internal.la \
 	libsystemd-shared.la
 
 rootbin_PROGRAMS += \
@@ -5531,6 +5545,8 @@ loginctl_SOURCES = \
 
 loginctl_LDADD = \
 	libsystemd-internal.la \
+	libsystemd-logs.la \
+	libsystemd-journal-internal.la \
 	libudev-internal.la \
 	libsystemd-shared.la