man,journal: add note about sd_journal_get_cutoff_monotonic_usec return value

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0de60148d8883c8bb8a9aad530a59a8f2e42aa0f..f0482cfe72c76131792376163583873c1170cd0c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2831,9 +2831,24 @@ tests += \
        test-dhcp6-client
 
 # ------------------------------------------------------------------------------
        test-dhcp6-client
 
 # ------------------------------------------------------------------------------

+if ENABLE_TERMINAL

 noinst_LTLIBRARIES += \
        libsystemd-terminal.la
 
 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_CFLAGS = \
        $(AM_CFLAGS)
 


@@ -2843,12 +2858,22 @@ 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-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
 
 
 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
 
 test_term_page_SOURCES = \
        src/libsystemd-terminal/test-term-page.c
 


@@ -2865,9 +2890,19 @@ test_term_parser_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
        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
 
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC