chiark / gitweb /
sd-event: check the value of received signal
[elogind.git] / Makefile.am
index e0cba7632914a799ddc61b4fdcf661d948f1bae7..60011b7d98e510cb7db9a48f2659b58fec65d7f0 100644 (file)
@@ -1341,6 +1341,7 @@ tests += \
        test-fileio \
        test-time \
        test-hashmap \
+       test-set \
        test-list \
        test-tables \
        test-device-nodes \
@@ -1572,6 +1573,12 @@ test_hashmap_SOURCES = \
 test_hashmap_LDADD = \
        libsystemd-core.la
 
+test_set_SOURCES = \
+       src/test/test-set.c
+
+test_set_LDADD = \
+       libsystemd-core.la
+
 test_xml_SOURCES = \
        src/test/test-xml.c
 
@@ -3013,14 +3020,15 @@ if ENABLE_TERMINAL
 noinst_LTLIBRARIES += \
        libsystemd-terminal.la
 
+bin_PROGRAMS += \
+       systemd-consoled
+
 noinst_PROGRAMS += \
        systemd-evcat \
        systemd-modeset \
        systemd-subterm
 
-unifontdatadir=$(datadir)/unifont
-
-dist_unifontdata_DATA = \
+dist_pkgdata_DATA += \
        src/libsystemd-terminal/unifont-glyph-array.bin
 
 tests += \
@@ -3046,13 +3054,15 @@ libsystemd_terminal_la_SOURCES = \
        src/libsystemd-terminal/sysview.h \
        src/libsystemd-terminal/sysview-internal.h \
        src/libsystemd-terminal/sysview.c \
+       src/libsystemd-terminal/term.h \
        src/libsystemd-terminal/term-internal.h \
        src/libsystemd-terminal/term-charset.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/unifont-internal.h \
+       src/libsystemd-terminal/unifont.h \
+       src/libsystemd-terminal/unifont-def.h \
        src/libsystemd-terminal/unifont.c
 
 libsystemd_terminal_la_LIBADD = \
@@ -3061,6 +3071,25 @@ libsystemd_terminal_la_LIBADD = \
        libsystemd-shared.la \
        $(TERMINAL_LIBS)
 
+systemd_consoled_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(TERMINAL_CFLAGS)
+
+systemd_consoled_SOURCES = \
+       src/console/consoled.h \
+       src/console/consoled.c \
+       src/console/consoled-display.c \
+       src/console/consoled-manager.c \
+       src/console/consoled-session.c \
+       src/console/consoled-terminal.c \
+       src/console/consoled-workspace.c
+
+systemd_consoled_LDADD = \
+       libsystemd-terminal.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la \
+       $(TERMINAL_LIBS)
+
 systemd_evcat_CFLAGS = \
        $(AM_CFLAGS) \
        $(TERMINAL_CFLAGS)
@@ -4140,8 +4169,9 @@ dist_pkgsysconf_DATA += \
 
 dist_catalog_DATA = \
        catalog/systemd.fr.catalog \
-       catalog/systemd.ru.catalog \
        catalog/systemd.it.catalog \
+       catalog/systemd.pl.catalog \
+       catalog/systemd.ru.catalog \
        catalog/systemd.catalog
 
 SOCKETS_TARGET_WANTS += \