test-cgroup-mask: fix masks in test and enable by default

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2b228692849823863302be7b42e8fc1c9c7c6b7e..91ecbe4a0bc1d39688cecbbf015a21ed4e835a8b 100644 (file)
--- 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 \
@@ -1224,13 +1225,11 @@ CLEANFILES += \
 
 # ------------------------------------------------------------------------------
 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 +1241,8 @@ manual_tests += \
 endif
 
 tests += \
+       test-engine \
+       test-cgroup-mask \
        test-job-type \
        test-env-replace \
        test-strbuf \
@@ -1476,10 +1477,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 +2832,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 +2883,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 +4439,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 +4553,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