X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=c6853e46eba4b98bfc22b8ecba679f57f4bc6371;hb=e9b11a8457293c553296e5d986a0bb7f86f275d5;hp=73f1252d307875ca4bb47fb15ba698c1061e539d;hpb=1c9633d669948155455e29b0c6e770995a8b1ca3;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 73f1252d3..c6853e46e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2831,9 +2831,24 @@ 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)
 
@@ -2842,12 +2857,23 @@ libsystemd_terminal_la_SOURCES = \
 	src/libsystemd-terminal/term-charset.c \
 	src/libsystemd-terminal/term-page.c \
 	src/libsystemd-terminal/term-parser.c \
-	src/libsystemd-terminal/term-wcwidth.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
 
@@ -2864,9 +2890,20 @@ test_term_parser_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-shared.la
 
-tests += \
-	test-term-page \
-	test-term-parser
+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
@@ -4401,9 +4438,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
 
@@ -4518,7 +4552,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