X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=1e4cfb31f1b03302137f7373b8477e6f03870cb7;hp=0b9491ade03532785df577def47cb32ac9cecd18;hb=aa9f11405829fd4755fef28602a7167dba3ddc89;hpb=84da4a3022bc599b26d9601cf1b7bf51d1d9f915

diff --git a/Makefile.am b/Makefile.am
index 0b9491ade..1e4cfb31f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -189,6 +189,7 @@ AM_CPPFLAGS = \
 	-DKEXEC=\"$(KEXEC)\" \
 	-DLIBDIR=\"$(libdir)\" \
 	-DROOTLIBDIR=\"$(rootlibdir)\" \
+	-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
 	-I $(top_srcdir)/src \
 	-I $(top_builddir)/src/shared \
 	-I $(top_srcdir)/src/shared \
@@ -349,7 +350,8 @@ bin_PROGRAMS = \
 	systemd-delta \
 	systemd-analyze \
 	systemd-run \
-	systemd-path
+	systemd-path \
+	systemd-verify
 
 dist_bin_SCRIPTS = \
 	src/kernel-install/kernel-install
@@ -1223,14 +1225,26 @@ CLEANFILES += \
 	src/core/org.freedesktop.systemd1.policy.in
 
 # ------------------------------------------------------------------------------
+
+systemd_verify_SOURCES = \
+	src/verify/verify.c
+
+systemd_verify_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(SECCOMP_CFLAGS)
+
+systemd_verify_LDADD = \
+	libsystemd-core.la \
+	$(RT_LIBS)
+
+# ------------------------------------------------------------------------------
+
 manual_tests += \
-	test-engine \
 	test-ns \
 	test-loopback \
 	test-hostname \
 	test-daemon \
 	test-cgroup \
-	test-cgroup-mask \
 	test-install \
 	test-watchdog \
 	test-log \
@@ -1242,6 +1256,8 @@ manual_tests += \
 endif
 
 tests += \
+	test-engine \
+	test-cgroup-mask \
 	test-job-type \
 	test-env-replace \
 	test-strbuf \
@@ -1476,10 +1492,13 @@ test_tables_SOURCES = \
 	src/journal/journald-server.c \
 	src/journal/journald-server.h
 
+test_tables_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir)/src/bus-proxyd
+
 test_tables_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS) \
-	-I$(srcdir)/src/bus-proxyd
+	$(SECCOMP_CFLAGS)
 
 test_tables_LDADD = \
 	libsystemd-logs.la \
@@ -2828,21 +2847,49 @@ tests += \
 	test-dhcp6-client
 
 # ------------------------------------------------------------------------------
+if ENABLE_TERMINAL
 noinst_LTLIBRARIES += \
 	libsystemd-terminal.la
 
+noinst_PROGRAMS += \
+	systemd-subterm
+
+unifontdatadir=$(datadir)/unifont
+
+dist_unifontdata_DATA = \
+	src/libsystemd-terminal/unifont-glyph-array.bin
+
+tests += \
+	test-term-page \
+	test-term-parser \
+	test-unifont
+endif
+
 libsystemd_terminal_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 libsystemd_terminal_la_SOURCES = \
 	src/libsystemd-terminal/term-internal.h \
+	src/libsystemd-terminal/term-charset.c \
 	src/libsystemd-terminal/term-page.c \
-	src/libsystemd-terminal/term-wcwidth.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.c
 
 libsystemd_terminal_la_LIBADD = \
 	libsystemd-internal.la \
 	libsystemd-shared.la
 
+systemd_subterm_SOURCES = \
+	src/libsystemd-terminal/subterm.c
+
+systemd_subterm_LDADD = \
+	libsystemd-terminal.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
 test_term_page_SOURCES = \
 	src/libsystemd-terminal/test-term-page.c
 
@@ -2851,8 +2898,28 @@ test_term_page_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-shared.la
 
-tests += \
-	test-term-page
+test_term_parser_SOURCES = \
+	src/libsystemd-terminal/test-term-parser.c
+
+test_term_parser_LDADD = \
+	libsystemd-terminal.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+test_unifont_SOURCES = \
+	src/libsystemd-terminal/test-unifont.c
+
+test_unifont_LDADD = \
+	libsystemd-terminal.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+.PHONY: update-unifont
+update-unifont: tools/compile-unifont.py
+	$(AM_V_GEN)$(PYTHON) $< \
+		<$(top_srcdir)/src/libsystemd-terminal/unifont.hex \
+		>$(top_srcdir)/src/libsystemd-terminal/unifont-glyph-array.bin
+	@echo "unifont-glyph-array.bin has been regenerated"
 
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC
@@ -4387,9 +4454,6 @@ dist_pkgdata_DATA += \
 dist_noinst_SCRIPT = \
 	src/locale/generate-kbd-model-map
 
-update-kbd-model-map: src/locale/generate-kbd-model-map
-	$PYTHON $< >src/locale/kbd-model-map
-
 localectl_SOURCES = \
 	src/locale/localectl.c
 
@@ -4504,7 +4568,7 @@ nodist_systemunit_DATA += \
 	units/systemd-timesyncd.service
 
 GENERAL_ALIASES += \
-	$(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-timesyncd.service
+	$(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/sysinit.target.wants/systemd-timesyncd.service
 
 EXTRA_DIST += \
 	units/systemd-timesyncd.service.in
@@ -4658,7 +4722,9 @@ systemd_resolved_SOURCES = \
 	src/resolve/resolved-dns-server.h \
 	src/resolve/resolved-dns-server.c \
 	src/resolve/resolved-dns-rr.h \
-	src/resolve/resolved-dns-rr.c
+	src/resolve/resolved-dns-rr.c \
+	src/resolve/resolved-dns-cache.h \
+	src/resolve/resolved-dns-cache.c
 
 nodist_systemd_resolved_SOURCES = \
 	src/resolve/resolved-gperf.c
@@ -4816,8 +4882,11 @@ systemd_networkd_wait_online_CFLAGS = \
 
 systemd_networkd_wait_online_SOURCES = \
 	src/libsystemd-network/network-internal.h \
+	src/network/networkd-wait-online.h \
+	src/network/networkd-wait-online-link.h \
 	src/network/networkd-wait-online.c \
-	src/network/networkd-wait-online.h
+	src/network/networkd-wait-online-manager.c \
+	src/network/networkd-wait-online-link.c
 
 systemd_networkd_wait_online_LDADD = \
 	libsystemd-network.la \