Makefile.am: tweaks to python commands

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 73f1252d307875ca4bb47fb15ba698c1061e539d..15a38bd4ca3877569f01ba1577d5b7d330ef01b0 100644 (file)
--- 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