chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
bus: add generator that turns old dbus1 activation files into .busname + .service...
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 728b860490ff60d31aba8bcff580eb5b06876a49..ce59c040b65633fd133bc6fa5fd2d670ef9e489c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -302,7 +302,6 @@ rootbin_PROGRAMS = \
 bin_PROGRAMS = \
        systemd-cgls \
        systemd-cgtop \
-       systemd-stdio-bridge \
        systemd-nspawn \
        systemd-detect-virt \
        systemd-delta \
@@ -329,6 +328,7 @@ rootlibexec_PROGRAMS = \
        systemd-ac-power \
        systemd-sysctl \
        systemd-sleep \
+       systemd-bus-proxyd \
        systemd-socket-proxyd
 
 systemgenerator_PROGRAMS = \
@@ -769,7 +769,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/errno-list.c \
        src/shared/errno-list.h \
        src/shared/syscall-list.c \
-       src/shared/syscall-list.h
+       src/shared/syscall-list.h \
+       src/shared/audit.c \
+       src/shared/audit.h
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
@@ -842,14 +844,6 @@ libsystemd_capability_la_CFLAGS = \
 libsystemd_capability_la_LIBADD = \
        $(CAP_LIBS)
 
-# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
-       libsystemd-audit.la
-
-libsystemd_audit_la_SOURCES = \
-       src/shared/audit.c \
-       src/shared/audit.h
-
 # ------------------------------------------------------------------------------
 if HAVE_ACL
 noinst_LTLIBRARIES += \
@@ -886,20 +880,22 @@ libsystemd_core_la_SOURCES = \
        src/core/load-fragment.h \
        src/core/service.c \
        src/core/service.h \
-       src/core/automount.c \
-       src/core/automount.h \
-       src/core/mount.c \
-       src/core/mount.h \
-       src/core/swap.c \
-       src/core/swap.h \
-       src/core/device.c \
-       src/core/device.h \
+       src/core/socket.c \
+       src/core/socket.h \
+       src/core/busname.c \
+       src/core/busname.h \
        src/core/target.c \
        src/core/target.h \
        src/core/snapshot.c \
        src/core/snapshot.h \
-       src/core/socket.c \
-       src/core/socket.h \
+       src/core/device.c \
+       src/core/device.h \
+       src/core/mount.c \
+       src/core/mount.h \
+       src/core/automount.c \
+       src/core/automount.h \
+       src/core/swap.c \
+       src/core/swap.h \
        src/core/timer.c \
        src/core/timer.h \
        src/core/path.c \
@@ -926,20 +922,22 @@ libsystemd_core_la_SOURCES = \
        src/core/dbus-service.h \
        src/core/dbus-socket.c \
        src/core/dbus-socket.h \
-       src/core/dbus-timer.c \
-       src/core/dbus-timer.h \
+       src/core/dbus-busname.c \
+       src/core/dbus-busname.h \
        src/core/dbus-target.c \
        src/core/dbus-target.h \
+       src/core/dbus-snapshot.c \
+       src/core/dbus-snapshot.h \
+       src/core/dbus-device.c \
+       src/core/dbus-device.h \
        src/core/dbus-mount.c \
        src/core/dbus-mount.h \
        src/core/dbus-automount.c \
        src/core/dbus-automount.h \
        src/core/dbus-swap.c \
        src/core/dbus-swap.h \
-       src/core/dbus-snapshot.c \
-       src/core/dbus-snapshot.h \
-       src/core/dbus-device.c \
-       src/core/dbus-device.h \
+       src/core/dbus-timer.c \
+       src/core/dbus-timer.h \
        src/core/dbus-path.c \
        src/core/dbus-path.h \
        src/core/dbus-slice.c \
@@ -1013,7 +1011,6 @@ libsystemd_core_la_LIBADD = \
        libsystemd-capability.la \
        libsystemd-units.la \
        libsystemd-label.la \
-       libsystemd-audit.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libudev-internal.la \
@@ -1048,35 +1045,35 @@ BUILT_SOURCES += \
        src/shared/errno-from-name.h \
        src/shared/errno-to-name.h
 
-src/shared/syscall-list.txt: Makefile
+src/shared/syscall-list.txt:
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9(]/ { sub(/__NR_/, "", $$2); if ($$2 !~ /SYSCALL_BASE/) print $$2; }' > $@
 
-src/shared/syscall-from-name.gperf: src/shared/syscall-list.txt Makefile
+src/shared/syscall-from-name.gperf: src/shared/syscall-list.txt
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@
 
-src/shared/syscall-from-name.h: src/shared/syscall-from-name.gperf Makefile
+src/shared/syscall-from-name.h: src/shared/syscall-from-name.gperf
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_syscall -H hash_syscall_name -p -C < $< > $@
 
-src/shared/syscall-to-name.h: src/shared/syscall-list.txt Makefile
+src/shared/syscall-to-name.h: src/shared/syscall-list.txt
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const syscall_names[] = { "} { printf "[SYSCALL_TO_INDEX(__NR_%s)] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
 
-src/shared/errno-list.txt: Makefile
+src/shared/errno-list.txt:
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+[0-9]/ { print $$2; }'  > $@
 
-src/shared/errno-from-name.gperf: src/shared/errno-list.txt Makefile
+src/shared/errno-from-name.gperf: src/shared/errno-list.txt
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct errno_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' < $< > $@
 
-src/shared/errno-from-name.h: src/shared/errno-from-name.gperf Makefile
+src/shared/errno-from-name.h: src/shared/errno-from-name.gperf
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_errno -H hash_errno_name -p -C < $< > $@
 
-src/shared/errno-to-name.h: src/shared/errno-list.txt Makefile
+src/shared/errno-to-name.h: src/shared/errno-list.txt
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
 
@@ -1755,6 +1752,18 @@ systemd_gpt_auto_generator_CFLAGS = \
        $(BLKID_CFLAGS)
 endif
 
+# ------------------------------------------------------------------------------
+systemgenerator_PROGRAMS +=  \
+       systemd-dbus1-generator
+
+systemd_dbus1_generator_SOURCES = \
+       src/dbus1-generator/dbus1-generator.c
+
+systemd_dbus1_generator_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       libsystemd-bus-internal.la
+
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
        src/rc-local-generator/rc-local-generator.c
@@ -1791,8 +1800,14 @@ systemctl_LDADD = \
        libsystemd-units.la \
        libsystemd-label.la \
        libsystemd-bus-internal.la \
-       libsystemd-logs.la \
-       libsystemd-login-internal.la \
+       libsystemd-logs.la
+
+if ENABLE_LOGIND
+systemctl_LDADD += \
+       libsystemd-login-internal.la
+endif
+
+systemctl_LDADD += \
        libsystemd-journal-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
@@ -1866,15 +1881,23 @@ systemd_run_LDADD = \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
-systemd_stdio_bridge_SOURCES = \
-       src/stdio-bridge/stdio-bridge.c
+systemd_bus_proxyd_SOURCES = \
+       src/bus-proxyd/bus-proxyd.c
 
-systemd_stdio_bridge_LDADD = \
+systemd_bus_proxyd_LDADD = \
        libsystemd-bus-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-shared.la
 
+bus-proxyd-install-hook:
+       $(AM_V_LN)$(LN_S) -f ../../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
+
+bus-proxyd-uninstall-hook:
+       rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
+
+INSTALL_EXEC_HOOKS += bus-proxyd-install-hook
+UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
        src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -1957,6 +1980,8 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/bus-container.h \
        src/libsystemd-bus/bus-message.c \
        src/libsystemd-bus/bus-message.h \
+       src/libsystemd-bus/bus-creds.c \
+       src/libsystemd-bus/bus-creds.h \
        src/libsystemd-bus/bus-signature.c \
        src/libsystemd-bus/bus-signature.h \
        src/libsystemd-bus/bus-type.c \
@@ -2035,6 +2060,7 @@ tests += \
        test-bus-introspect \
        test-bus-objects \
        test-bus-error \
+       test-bus-creds \
        test-event
 
 bin_PROGRAMS += \
@@ -2119,6 +2145,17 @@ test_bus_error_LDADD = \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
+test_bus_creds_SOURCES = \
+       src/libsystemd-bus/test-bus-creds.c
+
+test_bus_creds_LDADD = \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la \
+       libsystemd-bus-dump.la \
+       libsystemd-capability.la
+
 test_bus_match_SOURCES = \
        src/libsystemd-bus/test-bus-match.c
 
@@ -2380,17 +2417,17 @@ rootlibexec_PROGRAMS += \
 noinst_LTLIBRARIES += \
        libudev-core.la
 
-src/udev/keyboard-keys.txt: Makefile
+src/udev/keyboard-keys.txt:
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
 
-src/udev/keyboard-keys-from-name.gperf: src/udev/keyboard-keys.txt Makefile
+src/udev/keyboard-keys-from-name.gperf: src/udev/keyboard-keys.txt
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@
 
-src/udev/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf Makefile
+src/udev/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf
        $(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@
 
-src/udev/keyboard-keys-to-name.h: src/udev/keyboard-keys.txt Makefile
+src/udev/keyboard-keys-to-name.h: src/udev/keyboard-keys.txt
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
 
 libudev_core_la_SOURCES = \
@@ -2961,6 +2998,12 @@ test_journal_stream_SOURCES = \
 test_journal_stream_LDADD = \
        libsystemd-journal-core.la
 
+test_journal_flush_SOURCES = \
+       src/journal/test-journal-flush.c
+
+test_journal_flush_LDADD = \
+       libsystemd-journal-core.la
+
 test_journal_init_SOURCES = \
        src/journal/test-journal-init.c
 
@@ -3080,7 +3123,6 @@ nodist_libsystemd_journal_core_la_SOURCES = \
 libsystemd_journal_core_la_LIBADD = \
        libsystemd-journal-internal.la \
        libudev-internal.la \
-       libsystemd-audit.la \
        libsystemd-capability.la \
        libsystemd-label.la \
        libsystemd-daemon-internal.la \
@@ -3167,6 +3209,7 @@ tests += \
        test-journal-init \
        test-journal-verify \
        test-journal-interleaving \
+       test-journal-flush \
        test-mmap-cache \
        test-catalog
 
@@ -3205,6 +3248,8 @@ pkgconfiglib_DATA += \
 
 dist_catalog_DATA = \
        catalog/systemd-fr.catalog \
+       catalog/systemd-ru.catalog \
+       catalog/systemd-it.catalog \
        catalog/systemd.catalog
 
 SOCKETS_TARGET_WANTS += \
@@ -3770,7 +3815,6 @@ libsystemd_machine_core_la_SOURCES = \
 
 libsystemd_machine_core_la_LIBADD = \
        libsystemd-label.la \
-       libsystemd-audit.la \
        libsystemd-daemon-internal.la \
        libsystemd-bus-internal.la \
        libsystemd-id128-internal.la \
@@ -3833,6 +3877,7 @@ systemd_networkd_SOURCES = \
        src/network/networkd.h \
        src/network/networkd.c \
        src/network/networkd-link.c \
+       src/network/networkd-bridge.c \
        src/network/networkd-network.c \
        src/network/networkd-address.c \
        src/network/networkd-route.c \
@@ -3859,6 +3904,7 @@ test_network_SOURCES = \
        src/network/test-network.c \
        src/network/networkd.h \
        src/network/networkd-link.c \
+       src/network/networkd-bridge.c \
        src/network/networkd-network.c \
        src/network/networkd-address.c \
        src/network/networkd-route.c \
@@ -3923,7 +3969,6 @@ libsystemd_logind_core_la_SOURCES = \
 libsystemd_logind_core_la_LIBADD = \
        libsystemd-label.la \
        libsystemd-capability.la \
-       libsystemd-audit.la \
        libsystemd-daemon-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-bus-internal.la \
@@ -4063,7 +4108,6 @@ pam_systemd_la_LDFLAGS = \
 
 pam_systemd_la_LIBADD = \
        libsystemd-capability.la \
-       libsystemd-audit.la \
        libsystemd-bus-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
@@ -4128,6 +4172,8 @@ MULTI_USER_TARGET_WANTS += \
 SYSTEM_UNIT_ALIASES += \
        systemd-logind.service dbus-org.freedesktop.login1.service
 
+if ENABLE_MULTI_SEAT_X
+
 systemd_multi_seat_x_SOURCES = \
        src/login/multi-seat-x.c
 
@@ -4138,6 +4184,8 @@ systemd_multi_seat_x_LDADD = \
 rootlibexec_PROGRAMS += \
        systemd-multi-seat-x
 
+endif
+
 dist_udevrules_DATA += \
        src/login/70-uaccess.rules \
        src/login/70-power-switch.rules
@@ -4284,7 +4332,7 @@ dist_pkgpyexec_PYTHON = \
        src/python-systemd/daemon.py \
        src/python-systemd/__init__.py
 
-src/python-systemd/id128-constants.h: src/systemd/sd-messages.h Makefile
+src/python-systemd/id128-constants.h: src/systemd/sd-messages.h
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(SED) -n -r 's/,//g; s/#define (SD_MESSAGE_[A-Z0-9_]+)\s.*/add_id(m, "\1", \1) JOINER/p' <$< >$@
 
@@ -4372,28 +4420,28 @@ SED_PROCESS = \
        $(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \
                < $< > $@
 
-units/%: units/%.in Makefile
+units/%: units/%.in
        $(SED_PROCESS)
 
-man/%: man/%.in Makefile
+man/%: man/%.in
        $(SED_PROCESS)
 
-sysctl.d/%: sysctl.d/%.in Makefile
+sysctl.d/%: sysctl.d/%.in
        $(SED_PROCESS)
 
-%.pc: %.pc.in Makefile
+%.pc: %.pc.in
        $(SED_PROCESS)
 
-src/core/macros.%: src/core/macros.%.in Makefile
+src/core/macros.%: src/core/macros.%.in
        $(SED_PROCESS)
 
-src/%.policy.in: src/%.policy.in.in Makefile
+src/%.policy.in: src/%.policy.in.in
        $(SED_PROCESS)
 
-%.rules: %.rules.in Makefile
+%.rules: %.rules.in
        $(SED_PROCESS)
 
-%.sh: %.sh.in Makefile
+%.sh: %.sh.in
        $(SED_PROCESS)
        $(AM_V_GEN)chmod +x $@
 
@@ -4405,11 +4453,11 @@ src/%: src/%.m4
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
 
-units/%: units/%.m4 Makefile
+units/%: units/%.m4
        $(AM_V_M4)$(MKDIR_P) $(dir $@)
        $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
 
-units/user/%: units/%.m4 Makefile
+units/user/%: units/%.m4
        $(AM_V_M4)$(MKDIR_P) $(dir $@)
        $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
@@ -4432,7 +4480,7 @@ CLEANFILES += \
 
 # ------------------------------------------------------------------------------
 if ENABLE_MANPAGES
-man/custom-entities.ent: Makefile
+man/custom-entities.ent:
        $(AM_V_GEN)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)(echo '<?xml version="1.0" encoding="utf-8" ?>' && \
         echo '$(subst '|,<!ENTITY ,$(subst =, ",$(subst |',">,$(substitutions))))') \
@@ -4730,38 +4778,32 @@ endef
 test-libsystemd-bus-sym.c: \
        src/libsystemd-bus/libsystemd-bus.sym \
        src/systemd/sd-bus.h \
-       src/systemd/sd-utf8.h \
-       Makefile
+       src/systemd/sd-utf8.h
        $(generate-sym-test)
 
 test-libsystemd-daemon-sym.c: \
        src/libsystemd-daemon/libsystemd-daemon.sym \
-       src/systemd/sd-daemon.h \
-       Makefile
+       src/systemd/sd-daemon.h
        $(generate-sym-test)
 
 test-libsystemd-id128-sym.c: \
        src/libsystemd-id128/libsystemd-id128.sym \
-       src/systemd/sd-id128.h \
-       Makefile
+       src/systemd/sd-id128.h
        $(generate-sym-test)
 
 test-libsystemd-journal-sym.c: \
        src/journal/libsystemd-journal.sym \
-       src/systemd/sd-journal.h \
-       Makefile
+       src/systemd/sd-journal.h
        $(generate-sym-test)
 
 test-libsystemd-login-sym.c: \
        src/login/libsystemd-login.sym \
-       src/systemd/sd-login.h \
-       Makefile
+       src/systemd/sd-login.h
        $(generate-sym-test)
 
 test-libudev-sym.c: \
        src/libudev/libudev.sym \
-       src/udev/udev.h \
-       Makefile
+       src/udev/udev.h
        $(generate-sym-test)
 
 test_libsystemd_bus_sym_SOURCES = \
Unnamed repository; edit this file 'description' to name the repository.