chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
sysusers: split users for remote into separate file
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 702513768335585db98d123e8af3b5713dc0fa07..2e982f50672746c69d8267d37866774179b1e4f4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,6 +106,8 @@ udevrulesdir=$(udevlibexecdir)/rules.d
 udevhwdbdir=$(udevlibexecdir)/hwdb.d
 catalogdir=$(prefix)/lib/systemd/catalog
 kernelinstalldir = $(prefix)/lib/kernel/install.d
+factory_etcdir = $(prefix)/share/factory/etc
+factory_pamdir = $(prefix)/share/factory/etc/pam.d
 
 # And these are the special ones for /
 rootprefix=@rootprefix@
@@ -189,6 +191,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 +212,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)
@@ -405,6 +409,8 @@ dist_zshcompletion_DATA = \
        shell-completion/zsh/_systemd-analyze \
        shell-completion/zsh/_systemd-run \
        shell-completion/zsh/_sd_hosts_or_user_at_host \
+       shell-completion/zsh/_sd_outputmodes \
+       shell-completion/zsh/_sd_unit_files \
        shell-completion/zsh/_systemd-delta \
        shell-completion/zsh/_systemd
 
@@ -841,10 +847,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 +1228,13 @@ CLEANFILES += \
        src/core/org.freedesktop.systemd1.policy.in
 
 # ------------------------------------------------------------------------------
+
 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 +1246,8 @@ manual_tests += \
 endif
 
 tests += \
+       test-engine \
+       test-cgroup-mask \
        test-job-type \
        test-env-replace \
        test-strbuf \
@@ -1251,6 +1260,8 @@ tests += \
        test-ellipsize \
        test-util \
        test-ring \
+       test-barrier \
+       test-pty \
        test-tmpfiles \
        test-namespace \
        test-date \
@@ -1277,14 +1288,36 @@ tests += \
        test-ratelimit
 
 EXTRA_DIST += \
+       test/a.service \
+       test/basic.target \
+       test/b.service \
+       test/c.service \
+       test/daughter.service \
+       test/d.service \
+       test/end.service \
+       test/e.service \
+       test/f.service \
+       test/grandchild.service \
+       test/g.service \
+       test/hello-after-sleep.target \
+       test/hello.service \
+       test/h.service \
+       test/parent-deep.slice \
+       test/parent.slice \
+       test/paths.target \
        test/sched_idle_bad.service \
        test/sched_idle_ok.service \
        test/sched_rr_bad.service \
-       test/sched_rr_ok.service \
        test/sched_rr_change.service \
+       test/sched_rr_ok.service \
+       test/shutdown.target \
+       test/sleep.service \
+       test/sockets.target \
        test/son.service \
-       test/daughter.service \
-       test/parent.slice
+       test/sysinit.target \
+       test/testsuite.target \
+       test/timers.target \
+       test/unstoppable.service
 
 EXTRA_DIST += \
        src/test/test-helper.h
@@ -1421,6 +1454,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
 
@@ -1459,14 +1504,18 @@ 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 \
        libsystemd-journal-internal.la \
+       libsystemd-journal-core.la \
        libsystemd-core.la \
        libudev-core.la \
        $(RT_LIBS)
@@ -1702,11 +1751,19 @@ endif
 
 # ------------------------------------------------------------------------------
 systemd_analyze_SOURCES = \
-       src/analyze/analyze.c
+       src/analyze/analyze.c \
+       src/analyze/analyze-verify.c \
+       src/analyze/analyze-verify.h
+
+systemd_verify_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SECCOMP_CFLAGS)
 
 systemd_analyze_LDADD = \
+       libsystemd-core.la \
        libsystemd-internal.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       $(RT_LIBS)
 
 # ------------------------------------------------------------------------------
 systemd_initctl_SOURCES = \
@@ -1735,6 +1792,7 @@ systemd_update_done_SOURCES = \
 
 systemd_update_done_LDADD = \
        libsystemd-internal.la \
+       libsystemd-label.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1878,7 +1936,8 @@ SYSINIT_TARGET_WANTS += \
        systemd-sysusers.service
 
 dist_sysusers_DATA = \
-       sysusers.d/systemd.conf
+       sysusers.d/systemd.conf \
+       sysusers.d/systemd-remote.conf
 
 nodist_sysusers_DATA = \
        sysusers.d/basic.conf
@@ -1894,6 +1953,14 @@ INSTALL_DIRS += \
        $(sysusersdir)
 endif
 
+# ------------------------------------------------------------------------------
+dist_factory_etc_DATA = \
+       factory/etc/nsswitch.conf
+
+dist_factory_pam_DATA = \
+       factory/etc/pam.d/system-auth \
+       factory/etc/pam.d/other
+
 # ------------------------------------------------------------------------------
 if ENABLE_FIRSTBOOT
 systemd_firstboot_SOURCES = \
@@ -1918,7 +1985,6 @@ EXTRA_DIST += \
 
 SYSINIT_TARGET_WANTS += \
        systemd-firstboot.service
-
 endif
 
 # ------------------------------------------------------------------------------
@@ -2810,6 +2876,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 += \
@@ -3978,9 +4119,6 @@ dist_bashcompletion_DATA += \
 dist_zshcompletion_DATA += \
        shell-completion/zsh/_coredumpctl
 
-GENERAL_ALIASES += \
-       $(bindir)/coredumpctl $(bindir)/systemd-coredumpctl
-
 sysctl_DATA = \
        sysctl.d/50-coredump.conf
 
@@ -4343,9 +4481,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
 
@@ -4460,7 +4595,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
@@ -4605,6 +4740,12 @@ systemd_resolved_SOURCES = \
        src/resolve/resolved-link.c \
        src/resolve/resolved-dns-domain.h \
        src/resolve/resolved-dns-domain.c \
+       src/resolve/resolved-dns-rr.h \
+       src/resolve/resolved-dns-rr.c \
+       src/resolve/resolved-dns-question.h \
+       src/resolve/resolved-dns-question.c \
+       src/resolve/resolved-dns-answer.h \
+       src/resolve/resolved-dns-answer.c \
        src/resolve/resolved-dns-packet.h \
        src/resolve/resolved-dns-packet.c \
        src/resolve/resolved-dns-query.h \
@@ -4613,8 +4754,12 @@ systemd_resolved_SOURCES = \
        src/resolve/resolved-dns-scope.c \
        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-cache.h \
+       src/resolve/resolved-dns-cache.c \
+       src/resolve/resolved-dns-zone.h \
+       src/resolve/resolved-dns-zone.c \
+       src/resolve/resolved-dns-stream.h \
+       src/resolve/resolved-dns-stream.c
 
 nodist_systemd_resolved_SOURCES = \
        src/resolve/resolved-gperf.c
@@ -4703,6 +4848,26 @@ libnss_resolve_la_LIBADD = \
 lib_LTLIBRARIES += \
        libnss_resolve.la
 
+systemd_resolve_host_SOURCES = \
+       src/resolve-host/resolve-host.c \
+       src/resolve/resolved-dns-packet.c \
+       src/resolve/resolved-dns-packet.h \
+       src/resolve/resolved-dns-rr.c \
+       src/resolve/resolved-dns-rr.h \
+       src/resolve/resolved-dns-answer.c \
+       src/resolve/resolved-dns-answer.h \
+       src/resolve/resolved-dns-question.c \
+       src/resolve/resolved-dns-question.h \
+       src/resolve/resolved-dns-domain.c \
+       src/resolve/resolved-dns-domain.h
+
+systemd_resolve_host_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
+rootlibexec_PROGRAMS += \
+       systemd-resolve-host
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -4772,8 +4937,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 \
Unnamed repository; edit this file 'description' to name the repository.