chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
networkd: netdev - split NetDev struct into per-kind structs
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index a492a1f7c009409aafbe439ac2cc3b3ca27e765d..1e4cfb31f1b03302137f7373b8477e6f03870cb7 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 \
@@ -209,6 +210,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)
@@ -348,7 +350,8 @@ bin_PROGRAMS = \
        systemd-delta \
        systemd-analyze \
        systemd-run \
-       systemd-path
+       systemd-path \
+       systemd-verify
 
 dist_bin_SCRIPTS = \
        src/kernel-install/kernel-install
@@ -841,10 +844,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 \
@@ -1220,14 +1225,26 @@ CLEANFILES += \
        src/core/org.freedesktop.systemd1.policy.in
 
 # ------------------------------------------------------------------------------
+
+systemd_verify_SOURCES = \
+       src/verify/verify.c
+
+systemd_verify_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SECCOMP_CFLAGS)
+
+systemd_verify_LDADD = \
+       libsystemd-core.la \
+       $(RT_LIBS)
+
+# ------------------------------------------------------------------------------
+
 manual_tests += \
-       test-engine \
        test-ns \
        test-loopback \
        test-hostname \
        test-daemon \
        test-cgroup \
-       test-cgroup-mask \
        test-install \
        test-watchdog \
        test-log \
@@ -1239,6 +1256,8 @@ manual_tests += \
 endif
 
 tests += \
+       test-engine \
+       test-cgroup-mask \
        test-job-type \
        test-env-replace \
        test-strbuf \
@@ -1251,6 +1270,8 @@ tests += \
        test-ellipsize \
        test-util \
        test-ring \
+       test-barrier \
+       test-pty \
        test-tmpfiles \
        test-namespace \
        test-date \
@@ -1421,6 +1442,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 +1486,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 +1504,7 @@ test_tables_LDADD = \
        libsystemd-logs.la \
        libsystemd-journal-internal.la \
        libsystemd-core.la \
+       libudev-core.la \
        $(RT_LIBS)
 
 test_prioq_SOURCES = \
@@ -2804,6 +2846,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 += \
@@ -3373,16 +3490,6 @@ typelibs_DATA = \
 
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif # HAVE_INTROSPECTION
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libgudev-install-hook:
-       libname=libgudev-1.0.so && $(move-to-rootlibdir)
-
-libgudev-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libgudev-1.0.so*
-
-INSTALL_EXEC_HOOKS += libgudev-install-hook
-UNINSTALL_EXEC_HOOKS += libgudev-uninstall-hook
 endif
 
 EXTRA_DIST += \
@@ -4347,9 +4454,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
 
@@ -4464,7 +4568,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
@@ -4618,7 +4722,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
@@ -4776,8 +4882,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 \
@@ -4794,8 +4903,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 \
Unnamed repository; edit this file 'description' to name the repository.