install: systemd-timesyncd.service is enabled by sysinit.target

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 94cd402e7137dfe2ae747f636e8bb88eb22df130..c6853e46eba4b98bfc22b8ecba679f57f4bc6371 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -209,6 +209,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/libsystemd/sd-event \
        -I $(top_srcdir)/src/libsystemd/sd-rtnl \
        -I $(top_srcdir)/src/libsystemd-network \
+       -I $(top_srcdir)/src/libsystemd-terminal \
        $(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -841,10 +842,12 @@ libsystemd_shared_la_SOURCES = \
        src/shared/login-shared.h \
        src/shared/ring.c \
        src/shared/ring.h \
+       src/shared/barrier.c \
+       src/shared/barrier.h \
+       src/shared/pty.c \
+       src/shared/pty.h \
        src/shared/async.c \
        src/shared/async.h \
-       src/shared/eventfd-util.c \
-       src/shared/eventfd-util.h \
        src/shared/copy.c \
        src/shared/copy.h \
        src/shared/base-filesystem.c \
@@ -1251,6 +1254,8 @@ tests += \
        test-ellipsize \
        test-util \
        test-ring \
+       test-barrier \
+       test-pty \
        test-tmpfiles \
        test-namespace \
        test-date \
@@ -1421,6 +1426,18 @@ test_ring_SOURCES = \
 test_ring_LDADD = \
        libsystemd-core.la
 
+test_barrier_SOURCES = \
+       src/test/test-barrier.c
+
+test_barrier_LDADD = \
+       libsystemd-core.la
+
+test_pty_SOURCES = \
+       src/test/test-pty.c
+
+test_pty_LDADD = \
+       libsystemd-core.la
+
 test_tmpfiles_SOURCES = \
        src/test/test-tmpfiles.c
 
@@ -1453,7 +1470,15 @@ test_list_LDADD = \
 
 test_tables_SOURCES = \
        src/test/test-tables.c \
-       src/shared/test-tables.h
+       src/shared/test-tables.h \
+       src/bus-proxyd/bus-policy.c \
+       src/bus-proxyd/bus-policy.h \
+       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) \
@@ -1463,6 +1488,7 @@ test_tables_LDADD = \
        libsystemd-logs.la \
        libsystemd-journal-internal.la \
        libsystemd-core.la \
+       libudev-core.la \
        $(RT_LIBS)
 
 test_prioq_SOURCES = \
@@ -2804,6 +2830,81 @@ tests += \
        test-icmp6-rs \
        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-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
+
+test_term_page_LDADD = \
+       libsystemd-terminal.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
+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
 SUBDIRS += \
@@ -4337,9 +4438,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
 
@@ -4454,7 +4552,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
@@ -4608,7 +4706,9 @@ systemd_resolved_SOURCES = \
        src/resolve/resolved-dns-server.h \
        src/resolve/resolved-dns-server.c \
        src/resolve/resolved-dns-rr.h \
-       src/resolve/resolved-dns-rr.c
+       src/resolve/resolved-dns-rr.c \
+       src/resolve/resolved-dns-cache.h \
+       src/resolve/resolved-dns-cache.c
 
 nodist_systemd_resolved_SOURCES = \
        src/resolve/resolved-gperf.c
@@ -4766,8 +4866,11 @@ systemd_networkd_wait_online_CFLAGS = \
 
 systemd_networkd_wait_online_SOURCES = \
        src/libsystemd-network/network-internal.h \
+       src/network/networkd-wait-online.h \
+       src/network/networkd-wait-online-link.h \
        src/network/networkd-wait-online.c \
-       src/network/networkd-wait-online.h
+       src/network/networkd-wait-online-manager.c \
+       src/network/networkd-wait-online-link.c
 
 systemd_networkd_wait_online_LDADD = \
        libsystemd-network.la \
@@ -4784,8 +4887,17 @@ test_network_CFLAGS = \
 test_network_LDADD = \
        libsystemd-networkd-core.la
 
+test_network_tables_SOURCES = \
+       src/network/test-network-tables.c \
+       src/shared/test-tables.h
+
+test_network_tables_LDADD = \
+       libsystemd-networkd-core.la \
+       libudev-core.la
+
 tests += \
-       test-network
+       test-network \
+       test-network-tables
 
 nodist_systemunit_DATA += \
        units/systemd-networkd.service \