X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=3119a95dad28b361fd14a2064956dd6320401ea8;hb=10595afb4c007a764b91d28ede5faa00bcb28428;hp=e0cba7632914a799ddc61b4fdcf661d948f1bae7;hpb=37161c5148396448921841ae1026b281c7949652;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index e0cba7632..3119a95da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -712,7 +712,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 \
@@ -1341,6 +1342,7 @@ tests += \
 	test-fileio \
 	test-time \
 	test-hashmap \
+	test-set \
 	test-list \
 	test-tables \
 	test-device-nodes \
@@ -1572,6 +1574,12 @@ test_hashmap_SOURCES = \
 test_hashmap_LDADD = \
 	libsystemd-core.la
 
+test_set_SOURCES = \
+	src/test/test-set.c
+
+test_set_LDADD = \
+	libsystemd-core.la
+
 test_xml_SOURCES = \
 	src/test/test-xml.c
 
@@ -2469,13 +2477,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 = \
@@ -3013,14 +3024,15 @@ if ENABLE_TERMINAL
 noinst_LTLIBRARIES += \
 	libsystemd-terminal.la
 
+rootlibexec_PROGRAMS += \
+	systemd-consoled
+
 noinst_PROGRAMS += \
 	systemd-evcat \
 	systemd-modeset \
 	systemd-subterm
 
-unifontdatadir=$(datadir)/unifont
-
-dist_unifontdata_DATA = \
+dist_pkgdata_DATA += \
 	src/libsystemd-terminal/unifont-glyph-array.bin
 
 tests += \
@@ -3046,13 +3058,15 @@ libsystemd_terminal_la_SOURCES = \
 	src/libsystemd-terminal/sysview.h \
 	src/libsystemd-terminal/sysview-internal.h \
 	src/libsystemd-terminal/sysview.c \
+	src/libsystemd-terminal/term.h \
 	src/libsystemd-terminal/term-internal.h \
 	src/libsystemd-terminal/term-charset.c \
 	src/libsystemd-terminal/term-page.c \
 	src/libsystemd-terminal/term-parser.c \
 	src/libsystemd-terminal/term-screen.c \
 	src/libsystemd-terminal/term-wcwidth.c \
-	src/libsystemd-terminal/unifont-internal.h \
+	src/libsystemd-terminal/unifont.h \
+	src/libsystemd-terminal/unifont-def.h \
 	src/libsystemd-terminal/unifont.c
 
 libsystemd_terminal_la_LIBADD = \
@@ -3061,6 +3075,25 @@ libsystemd_terminal_la_LIBADD = \
 	libsystemd-shared.la \
 	$(TERMINAL_LIBS)
 
+systemd_consoled_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(TERMINAL_CFLAGS)
+
+systemd_consoled_SOURCES = \
+	src/console/consoled.h \
+	src/console/consoled.c \
+	src/console/consoled-display.c \
+	src/console/consoled-manager.c \
+	src/console/consoled-session.c \
+	src/console/consoled-terminal.c \
+	src/console/consoled-workspace.c
+
+systemd_consoled_LDADD = \
+	libsystemd-terminal.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la \
+	$(TERMINAL_LIBS)
+
 systemd_evcat_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(TERMINAL_CFLAGS)
@@ -4140,8 +4173,9 @@ dist_pkgsysconf_DATA += \
 
 dist_catalog_DATA = \
 	catalog/systemd.fr.catalog \
-	catalog/systemd.ru.catalog \
 	catalog/systemd.it.catalog \
+	catalog/systemd.pl.catalog \
+	catalog/systemd.ru.catalog \
 	catalog/systemd.catalog
 
 SOCKETS_TARGET_WANTS += \