X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=f0482cfe72c76131792376163583873c1170cd0c;hb=86db5dfb6d334e583ea4161191754522ce850eed;hp=0615f663ce5193de0560889df3058fd86cf0cd40;hpb=5ab887e98d80ffaf05a97abe4cdc1553a85f0637;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 0615f663c..f0482cfe7 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)
 
@@ -2843,15 +2858,14 @@ libsystemd_terminal_la_SOURCES = \
 	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/term-wcwidth.c \
+	src/libsystemd-terminal/unifont-internal.h \
+	src/libsystemd-terminal/unifont.c
 
 libsystemd_terminal_la_LIBADD = \
 	libsystemd-internal.la \
 	libsystemd-shared.la
 
-noinst_PROGRAMS += \
-	systemd-subterm
-
 systemd_subterm_SOURCES = \
 	src/libsystemd-terminal/subterm.c
 
@@ -2876,9 +2890,19 @@ 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
+
+update-unifont:
+	$(AM_V_GEN)cat $(top_srcdir)/src/libsystemd-terminal/unifont.hex | $(PYTHON) $(top_srcdir)/tools/compile-unifont.py >$(top_srcdir)/src/libsystemd-terminal/unifont-glyph-array.bin
+	@echo "unifont-glyph-array.bin has been regenerated"
+
+.PHONY: update-unifont
 
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC