X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=e52db1793bb6d83ba5da6a0b6a3054a7fdf15e83;hp=60011b7d98e510cb7db9a48f2659b58fec65d7f0;hb=3e883473a0f36c220fc45ecf61d6878c9ac308b4;hpb=ce7b9f50c3fadbad22feeb28e4429ad9bee02bcc

diff --git a/Makefile.am b/Makefile.am
index 60011b7d9..e52db1793 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -250,6 +250,7 @@ SOCKETS_TARGET_WANTS =
 BUSNAMES_TARGET_WANTS =
 TIMERS_TARGET_WANTS =
 USER_SOCKETS_TARGET_WANTS =
+USER_DEFAULT_TARGET_WANTS =
 USER_BUSNAMES_TARGET_WANTS =
 
 SYSTEM_UNIT_ALIASES =
@@ -270,6 +271,7 @@ install-target-wants-hook:
 	what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
 	what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
 	what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
+	what="$(USER_DEFAULT_TARGET_WANTS)" && wants=default.target && dir=$(userunitdir) && $(add-wants)
 
 install-busnames-target-wants-hook:
 	what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
@@ -712,7 +714,8 @@ man/systemd.directives.xml: $(top_srcdir)/tools/make-directive-index.py $(SOURCE
 EXTRA_DIST += \
 	man/systemd.index.xml \
 	man/index.html \
-	man/systemd.directives.xml
+	man/systemd.directives.xml \
+	man/glib-event-glue.c
 
 CLEANFILES += \
 	man/systemd.index.xml \
@@ -2476,13 +2479,16 @@ nodist_systemunit_DATA += \
 dist_systemunit_DATA += \
 	units/systemd-bus-proxyd.socket
 
-dist_userunit_DATA += \
-	units/user/systemd-bus-proxyd.socket \
+nodist_userunit_DATA += \
 	units/user/systemd-bus-proxyd@.service
+
+dist_userunit_DATA += \
+	units/user/systemd-bus-proxyd.socket
 endif
 
 EXTRA_DIST += \
-	units/systemd-bus-proxyd@.service.in
+	units/systemd-bus-proxyd@.service.in \
+	units/user/systemd-bus-proxyd@.service.in
 
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
@@ -3020,7 +3026,7 @@ if ENABLE_TERMINAL
 noinst_LTLIBRARIES += \
 	libsystemd-terminal.la
 
-bin_PROGRAMS += \
+rootlibexec_PROGRAMS += \
 	systemd-consoled
 
 noinst_PROGRAMS += \
@@ -3031,6 +3037,15 @@ noinst_PROGRAMS += \
 dist_pkgdata_DATA += \
 	src/libsystemd-terminal/unifont-glyph-array.bin
 
+nodist_userunit_DATA += \
+	units/user/systemd-consoled.service
+
+USER_DEFAULT_TARGET_WANTS += \
+	systemd-consoled.service
+
+EXTRA_DIST += \
+	units/user/systemd-consoled.service.in
+
 tests += \
 	test-term-page \
 	test-term-parser \