chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: export libsystemd-bus as a public library
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 66bbf203a736ddc6660d74b95adc7333137406dd..016ce5e3b9b5e4c0f4c37628f128ad9410170e0f 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-59,6
+59,10
@@
LIBSYSTEMD_JOURNAL_CURRENT=11
LIBSYSTEMD_JOURNAL_REVISION=3
LIBSYSTEMD_JOURNAL_AGE=11
LIBSYSTEMD_JOURNAL_REVISION=3
LIBSYSTEMD_JOURNAL_AGE=11
+LIBSYSTEMD_BUS_CURRENT=0
+LIBSYSTEMD_BUS_REVISION=0
+LIBSYSTEMD_BUS_AGE=0
+
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
dbussessionservicedir=@dbussessionservicedir@
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
dbussessionservicedir=@dbussessionservicedir@
@@
-344,6
+348,7
@@
dist_zshcompletion_DATA = \
shell-completion/zsh/_kernel-install \
shell-completion/zsh/_systemd-nspawn \
shell-completion/zsh/_systemd-analyze \
shell-completion/zsh/_kernel-install \
shell-completion/zsh/_systemd-nspawn \
shell-completion/zsh/_systemd-analyze \
+ shell-completion/zsh/_systemd-run \
shell-completion/zsh/_sd_hosts_or_user_at_host \
shell-completion/zsh/_systemd-delta \
shell-completion/zsh/_systemd
shell-completion/zsh/_sd_hosts_or_user_at_host \
shell-completion/zsh/_systemd-delta \
shell-completion/zsh/_systemd
@@
-417,6
+422,7
@@
nodist_systemunit_DATA = \
units/serial-getty@.service \
units/console-shell.service \
units/console-getty.service \
units/serial-getty@.service \
units/console-shell.service \
units/console-getty.service \
+ units/container-getty@.service \
units/systemd-initctl.service \
units/systemd-shutdownd.service \
units/systemd-remount-fs.service \
units/systemd-initctl.service \
units/systemd-shutdownd.service \
units/systemd-remount-fs.service \
@@
-459,6
+465,7
@@
EXTRA_DIST += \
units/serial-getty@.service.m4 \
units/console-shell.service.m4.in \
units/console-getty.service.m4.in \
units/serial-getty@.service.m4 \
units/console-shell.service.m4.in \
units/console-getty.service.m4.in \
+ units/container-getty@.service.m4.in \
units/rescue.service.m4.in \
units/systemd-initctl.service.in \
units/systemd-shutdownd.service.in \
units/rescue.service.m4.in \
units/systemd-initctl.service.in \
units/systemd-shutdownd.service.in \
@@
-494,6
+501,7
@@
EXTRA_DIST += \
CLEANFILES += \
units/console-shell.service.m4 \
units/console-getty.service.m4 \
CLEANFILES += \
units/console-shell.service.m4 \
units/console-getty.service.m4 \
+ units/container-getty@.service.m4 \
units/rescue.service.m4
if HAVE_SYSV_COMPAT
units/rescue.service.m4
if HAVE_SYSV_COMPAT
@@
-744,7
+752,11
@@
libsystemd_shared_la_SOURCES = \
src/shared/apparmor-util.c \
src/shared/apparmor-util.h \
src/shared/ima-util.c \
src/shared/apparmor-util.c \
src/shared/apparmor-util.h \
src/shared/ima-util.c \
- src/shared/ima-util.h
+ src/shared/ima-util.h \
+ src/shared/ptyfwd.c \
+ src/shared/ptyfwd.h \
+ src/shared/net-util.c \
+ src/shared/net-util.h
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
@@
-752,11
+764,7
@@
noinst_LTLIBRARIES += \
libsystemd_dbus_la_SOURCES = \
src/shared/dbus-common.c \
libsystemd_dbus_la_SOURCES = \
src/shared/dbus-common.c \
- src/shared/dbus-common.h \
- src/shared/dbus-loop.c \
- src/shared/dbus-loop.h \
- src/shared/polkit.c \
- src/shared/polkit.h
+ src/shared/dbus-common.h
libsystemd_dbus_la_CFLAGS = \
$(AM_CFLAGS) \
libsystemd_dbus_la_CFLAGS = \
$(AM_CFLAGS) \
@@
-1473,7
+1481,10
@@
systemd_analyze_CFLAGS = \
systemd_analyze_LDADD = \
libsystemd-shared.la \
systemd_analyze_LDADD = \
libsystemd-shared.la \
- libsystemd-bus.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon.la \
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \
# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \
@@
-1484,9
+1495,10
@@
systemd_initctl_CFLAGS = \
$(DBUS_CFLAGS)
systemd_initctl_LDADD = \
$(DBUS_CFLAGS)
systemd_initctl_LDADD = \
- libsystemd-shared.la \
- libsystemd-daemon.la \
- libsystemd-bus.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_update_utmp_SOURCES = \
# ------------------------------------------------------------------------------
systemd_update_utmp_SOURCES = \
@@
-1498,8
+1510,10
@@
systemd_update_utmp_CFLAGS = \
$(AUDIT_CFLAGS)
systemd_update_utmp_LDADD = \
$(AUDIT_CFLAGS)
systemd_update_utmp_LDADD = \
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
libsystemd-shared.la \
libsystemd-shared.la \
- libsystemd-bus.la \
$(AUDIT_LIBS)
# ------------------------------------------------------------------------------
$(AUDIT_LIBS)
# ------------------------------------------------------------------------------
@@
-1652,8
+1666,10
@@
systemd_fsck_CFLAGS = \
$(DBUS_CFLAGS)
systemd_fsck_LDADD = \
$(DBUS_CFLAGS)
systemd_fsck_LDADD = \
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
libsystemd-shared.la \
libsystemd-shared.la \
- libsystemd-bus.la \
libudev.la
# ------------------------------------------------------------------------------
libudev.la
# ------------------------------------------------------------------------------
@@
-1781,8
+1797,10
@@
systemd_cgroups_agent_SOURCES = \
src/cgroups-agent/cgroups-agent.c
systemd_cgroups_agent_LDADD = \
src/cgroups-agent/cgroups-agent.c
systemd_cgroups_agent_LDADD = \
- libsystemd-shared.la \
- libsystemd-bus.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
systemctl_SOURCES = \
# ------------------------------------------------------------------------------
systemctl_SOURCES = \
@@
-1849,10
+1867,10
@@
systemd_nspawn_SOURCES = \
systemd_nspawn_LDADD = \
libsystemd-label.la \
libsystemd-capability.la \
systemd_nspawn_LDADD = \
libsystemd-label.la \
libsystemd-capability.la \
- libsystemd-shared.la \
- libsystemd-daemon.la \
+ libsystemd-bus-internal.la \
libsystemd-id128-internal.la \
libsystemd-id128-internal.la \
- libsystemd-bus.la
+ libsystemd-shared.la \
+ libsystemd-daemon.la
# ------------------------------------------------------------------------------
systemd_run_SOURCES = \
# ------------------------------------------------------------------------------
systemd_run_SOURCES = \
@@
-1861,10
+1879,10
@@
systemd_run_SOURCES = \
systemd_run_LDADD = \
libsystemd-label.la \
libsystemd-capability.la \
systemd_run_LDADD = \
libsystemd-label.la \
libsystemd-capability.la \
+ libsystemd-bus-internal.la \
libsystemd-shared.la \
libsystemd-daemon.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-id128-internal.la \
- libsystemd-bus.la
+ libsystemd-id128-internal.la
# ------------------------------------------------------------------------------
systemd_stdio_bridge_SOURCES = \
# ------------------------------------------------------------------------------
systemd_stdio_bridge_SOURCES = \
@@
-1947,6
+1965,8
@@
libsystemd_bus_la_SOURCES = \
src/libsystemd-bus/bus-socket.h \
src/libsystemd-bus/bus-kernel.c \
src/libsystemd-bus/bus-kernel.h \
src/libsystemd-bus/bus-socket.h \
src/libsystemd-bus/bus-kernel.c \
src/libsystemd-bus/bus-kernel.h \
+ src/libsystemd-bus/bus-container.c \
+ src/libsystemd-bus/bus-container.h \
src/libsystemd-bus/bus-message.c \
src/libsystemd-bus/bus-message.h \
src/libsystemd-bus/bus-signature.c \
src/libsystemd-bus/bus-message.c \
src/libsystemd-bus/bus-message.h \
src/libsystemd-bus/bus-signature.c \
@@
-1978,9
+1998,23
@@
libsystemd_bus_la_CFLAGS = \
$(AM_CFLAGS) \
-pthread
$(AM_CFLAGS) \
-pthread
-noinst_LTLIBRARIES += \
+libsystemd_bus_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
+ -version-info $(LIBSYSTEMD_BUS_CURRENT):$(LIBSYSTEMD_BUS_REVISION):$(LIBSYSTEMD_BUS_AGE) \
+ -Wl,--version-script=$(top_srcdir)/src/libsystemd-bus/libsystemd-bus.sym
+
+lib_LTLIBRARIES += \
libsystemd-bus.la
libsystemd-bus.la
+libsystemd_bus_internal_la_SOURCES = \
+ $(libsystemd_bus_la_SOURCES)
+
+libsystemd_bus_internal_la_CFLAGS = \
+ $(libsystemd_bus_la_CFLAGS)
+
+noinst_LTLIBRARIES += \
+ libsystemd-bus-internal.la
+
tests += \
test-bus-marshal \
test-bus-signature \
tests += \
test-bus-marshal \
test-bus-signature \
@@
-2003,8
+2037,10
@@
test_bus_marshal_SOURCES = \
src/libsystemd-bus/test-bus-marshal.c
test_bus_marshal_LDADD = \
src/libsystemd-bus/test-bus-marshal.c
test_bus_marshal_LDADD = \
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
libsystemd-shared.la \
libsystemd-shared.la \
- libsystemd-
bus
.la \
+ libsystemd-
daemon
.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
$(GLIB_LIBS) \
$(DBUS_LIBS)
@@
-2018,7
+2054,7
@@
test_bus_signature_SOURCES = \
test_bus_signature_LDADD = \
libsystemd-shared.la \
test_bus_signature_LDADD = \
libsystemd-shared.la \
- libsystemd-bus.la
+ libsystemd-bus
-internal
.la
test_bus_chat_SOURCES = \
src/libsystemd-bus/test-bus-chat.c
test_bus_chat_SOURCES = \
src/libsystemd-bus/test-bus-chat.c
@@
-2028,9
+2064,10
@@
test_bus_chat_CFLAGS = \
-pthread
test_bus_chat_LDADD = \
-pthread
test_bus_chat_LDADD = \
- libsystemd-shared.la \
- libsystemd-bus.la \
- libsystemd-id128-internal.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
test_bus_server_SOURCES = \
src/libsystemd-bus/test-bus-server.c
test_bus_server_SOURCES = \
src/libsystemd-bus/test-bus-server.c
@@
-2040,9
+2077,10
@@
test_bus_server_CFLAGS = \
-pthread
test_bus_server_LDADD = \
-pthread
test_bus_server_LDADD = \
- libsystemd-shared.la \
- libsystemd-bus.la \
- libsystemd-id128-internal.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
test_bus_objects_SOURCES = \
src/libsystemd-bus/test-bus-objects.c
test_bus_objects_SOURCES = \
src/libsystemd-bus/test-bus-objects.c
@@
-2052,77
+2090,87
@@
test_bus_objects_CFLAGS = \
-pthread
test_bus_objects_LDADD = \
-pthread
test_bus_objects_LDADD = \
- libsystemd-shared.la \
- libsystemd-bus.la \
- libsystemd-id128-internal.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
test_bus_match_SOURCES = \
src/libsystemd-bus/test-bus-match.c
test_bus_match_LDADD = \
test_bus_match_SOURCES = \
src/libsystemd-bus/test-bus-match.c
test_bus_match_LDADD = \
- libsystemd-shared.la \
- libsystemd-bus.la \
- libsystemd-id128-internal.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
test_bus_kernel_SOURCES = \
src/libsystemd-bus/test-bus-kernel.c
test_bus_kernel_LDADD = \
test_bus_kernel_SOURCES = \
src/libsystemd-bus/test-bus-kernel.c
test_bus_kernel_LDADD = \
- libsystemd-shared.la \
- libsystemd-bus.la \
- libsystemd-id128-internal.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
test_bus_kernel_bloom_SOURCES = \
src/libsystemd-bus/test-bus-kernel-bloom.c
test_bus_kernel_bloom_LDADD = \
test_bus_kernel_bloom_SOURCES = \
src/libsystemd-bus/test-bus-kernel-bloom.c
test_bus_kernel_bloom_LDADD = \
- libsystemd-shared.la \
- libsystemd-bus.la \
- libsystemd-id128-internal.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
test_bus_kernel_benchmark_SOURCES = \
src/libsystemd-bus/test-bus-kernel-benchmark.c
test_bus_kernel_benchmark_LDADD = \
test_bus_kernel_benchmark_SOURCES = \
src/libsystemd-bus/test-bus-kernel-benchmark.c
test_bus_kernel_benchmark_LDADD = \
- libsystemd-shared.la \
- libsystemd-bus.la \
- libsystemd-id128-internal.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
test_bus_memfd_SOURCES = \
src/libsystemd-bus/test-bus-memfd.c
test_bus_memfd_LDADD = \
libsystemd-shared.la \
test_bus_memfd_SOURCES = \
src/libsystemd-bus/test-bus-memfd.c
test_bus_memfd_LDADD = \
libsystemd-shared.la \
- libsystemd-bus.la
+ libsystemd-bus
-internal
.la
test_bus_zero_copy_SOURCES = \
src/libsystemd-bus/test-bus-zero-copy.c
test_bus_zero_copy_LDADD = \
test_bus_zero_copy_SOURCES = \
src/libsystemd-bus/test-bus-zero-copy.c
test_bus_zero_copy_LDADD = \
- libsystemd-shared.la \
- libsystemd-bus.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
test_bus_introspect_SOURCES = \
src/libsystemd-bus/test-bus-introspect.c
test_bus_introspect_LDADD = \
libsystemd-shared.la \
test_bus_introspect_SOURCES = \
src/libsystemd-bus/test-bus-introspect.c
test_bus_introspect_LDADD = \
libsystemd-shared.la \
- libsystemd-bus.la
+ libsystemd-bus
-internal
.la
test_event_SOURCES = \
src/libsystemd-bus/test-event.c
test_event_LDADD = \
test_event_SOURCES = \
src/libsystemd-bus/test-event.c
test_event_LDADD = \
- libsystemd-shared.la \
- libsystemd-bus.la \
- libsystemd-id128-internal.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
busctl_SOURCES = \
src/libsystemd-bus/busctl.c
busctl_LDADD = \
busctl_SOURCES = \
src/libsystemd-bus/busctl.c
busctl_LDADD = \
- libsystemd-shared.la \
- libsystemd-bus.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
if ENABLE_GTK_DOC
# ------------------------------------------------------------------------------
if ENABLE_GTK_DOC
@@
-2224,6
+2272,7
@@
dist_udevrules_DATA += \
rules/99-systemd.rules \
rules/42-usb-hid-pm.rules \
rules/50-udev-default.rules \
rules/99-systemd.rules \
rules/42-usb-hid-pm.rules \
rules/50-udev-default.rules \
+ rules/60-drm.rules \
rules/60-keyboard.rules \
rules/60-persistent-storage-tape.rules \
rules/60-persistent-serial.rules \
rules/60-keyboard.rules \
rules/60-persistent-storage-tape.rules \
rules/60-persistent-serial.rules \
@@
-2234,7
+2283,7
@@
dist_udevrules_DATA += \
rules/75-net-description.rules \
rules/75-tty-description.rules \
rules/78-sound-card.rules \
rules/75-net-description.rules \
rules/75-tty-description.rules \
rules/78-sound-card.rules \
- rules/8
5-net-configure
-link.rules \
+ rules/8
0-net-setup
-link.rules \
rules/95-udev-late.rules
dist_udevhwdb_DATA = \
rules/95-udev-late.rules
dist_udevhwdb_DATA = \
@@
-2320,7
+2369,6
@@
libudev_core_la_SOURCES = \
src/udev/udev-builtin-usb_id.c \
src/udev/net/link-config.h \
src/udev/net/link-config.c \
src/udev/udev-builtin-usb_id.c \
src/udev/net/link-config.h \
src/udev/net/link-config.c \
- src/udev/net/link-config-parse.c \
src/udev/net/ethtool-util.h \
src/udev/net/ethtool-util.c
src/udev/net/ethtool-util.h \
src/udev/net/ethtool-util.c
@@
-3198,12
+3246,12
@@
systemd_socket_proxyd_SOURCES = \
src/socket-proxy/socket-proxyd.c
systemd_socket_proxyd_LDADD = \
src/socket-proxy/socket-proxyd.c
systemd_socket_proxyd_LDADD = \
- libsystemd-shared.la \
libsystemd-logs.la \
libsystemd-logs.la \
+ libsystemd-bus-internal.la \
libsystemd-journal-internal.la \
libsystemd-id128-internal.la \
libsystemd-journal-internal.la \
libsystemd-id128-internal.la \
- libsystemd-
daemon
.la \
- libsystemd-
bus
.la
+ libsystemd-
shared
.la \
+ libsystemd-
daemon
.la
# ------------------------------------------------------------------------------
if ENABLE_COREDUMP
# ------------------------------------------------------------------------------
if ENABLE_COREDUMP
@@
-3489,9
+3537,10
@@
systemd_hostnamed_SOURCES = \
systemd_hostnamed_LDADD = \
libsystemd-label.la \
systemd_hostnamed_LDADD = \
libsystemd-label.la \
- libsystemd-shared.la \
- libsystemd-daemon.la \
- libsystemd-bus.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
rootlibexec_PROGRAMS += \
systemd-hostnamed
rootlibexec_PROGRAMS += \
systemd-hostnamed
@@
-3514,14
+3563,11
@@
SYSTEM_UNIT_ALIASES += \
hostnamectl_SOURCES = \
src/hostname/hostnamectl.c
hostnamectl_SOURCES = \
src/hostname/hostnamectl.c
-hostnamectl_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
hostnamectl_LDADD = \
hostnamectl_LDADD = \
- libsystemd-shared.la \
- libsystemd-dbus.la \
- libsystemd-id128-internal.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
bin_PROGRAMS += \
hostnamectl
bin_PROGRAMS += \
hostnamectl
@@
-3547,9
+3593,10
@@
systemd_localed_SOURCES = \
systemd_localed_LDADD = \
libsystemd-label.la \
systemd_localed_LDADD = \
libsystemd-label.la \
- libsystemd-shared.la \
- libsystemd-daemon.la \
- libsystemd-bus.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
nodist_systemunit_DATA += \
units/systemd-localed.service
nodist_systemunit_DATA += \
units/systemd-localed.service
@@
-3581,14
+3628,11
@@
update-kbd-model-map: src/locale/generate-kbd-model-map
localectl_SOURCES = \
src/locale/localectl.c
localectl_SOURCES = \
src/locale/localectl.c
-localectl_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
localectl_LDADD = \
localectl_LDADD = \
- libsystemd-shared.la \
- libsystemd-dbus.la \
- libsystemd-id128-internal.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
bin_PROGRAMS += \
localectl
bin_PROGRAMS += \
localectl
@@
-3614,8
+3658,10
@@
systemd_timedated_SOURCES = \
systemd_timedated_LDADD = \
libsystemd-label.la \
systemd_timedated_LDADD = \
libsystemd-label.la \
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
libsystemd-shared.la \
libsystemd-shared.la \
- libsystemd-daemon.la \
libsystemd-bus.la
rootlibexec_PROGRAMS += \
libsystemd-bus.la
rootlibexec_PROGRAMS += \
@@
-3648,8
+3694,10
@@
timedatectl_CFLAGS = \
$(DBUS_CFLAGS)
timedatectl_LDADD = \
$(DBUS_CFLAGS)
timedatectl_LDADD = \
- libsystemd-shared.la \
- libsystemd-dbus.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
bin_PROGRAMS += \
timedatectl
bin_PROGRAMS += \
timedatectl
@@
-3710,7
+3758,7
@@
libsystemd_machine_core_la_LIBADD = \
libsystemd-audit.la \
libsystemd-shared.la \
libsystemd-daemon.la \
libsystemd-audit.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-bus.la \
+ libsystemd-bus
-internal
.la \
libsystemd-id128-internal.la \
libudev.la
libsystemd-id128-internal.la \
libudev.la
@@
-3725,8
+3773,10
@@
machinectl_CFLAGS = \
$(DBUS_CFLAGS)
machinectl_LDADD = \
$(DBUS_CFLAGS)
machinectl_LDADD = \
- libsystemd-shared.la \
- libsystemd-bus.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
rootbin_PROGRAMS += \
machinectl
rootbin_PROGRAMS += \
machinectl
@@
-3772,9
+3822,6
@@
systemd_logind_SOURCES = \
nodist_systemd_logind_SOURCES = \
src/login/logind-gperf.c
nodist_systemd_logind_SOURCES = \
src/login/logind-gperf.c
-systemd_logind_CFLAGS = \
- $(libsystemd_logind_core_la_CFLAGS)
-
systemd_logind_LDADD = \
libsystemd-logind-core.la \
$(libsystemd_logind_core_la_LIBADD)
systemd_logind_LDADD = \
libsystemd-logind-core.la \
$(libsystemd_logind_core_la_LIBADD)
@@
-3805,17
+3852,13
@@
libsystemd_logind_core_la_SOURCES = \
src/login/login-shared.c \
src/login/login-shared.h
src/login/login-shared.c \
src/login/login-shared.h
-libsystemd_logind_core_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
libsystemd_logind_core_la_LIBADD = \
libsystemd-label.la \
libsystemd-audit.la \
libsystemd-shared.la \
libsystemd-daemon.la \
libsystemd_logind_core_la_LIBADD = \
libsystemd-label.la \
libsystemd-audit.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-dbus.la \
libsystemd-id128-internal.la \
libsystemd-id128-internal.la \
+ libsystemd-bus-internal.la \
libudev.la
if HAVE_ACL
libudev.la
if HAVE_ACL
@@
-3870,8
+3913,10
@@
systemd_inhibit_CFLAGS = \
$(DBUS_CFLAGS)
systemd_inhibit_LDADD = \
$(DBUS_CFLAGS)
systemd_inhibit_LDADD = \
- libsystemd-shared.la \
- libsystemd-bus.la
+ libsystemd-bus-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-shared.la
rootbin_PROGRAMS += \
systemd-inhibit
rootbin_PROGRAMS += \
systemd-inhibit
@@
-3895,11
+3940,7
@@
test_inhibit_SOURCES = \
test_inhibit_LDADD = \
libsystemd-shared.la \
test_inhibit_LDADD = \
libsystemd-shared.la \
- libsystemd-dbus.la
-
-test_inhibit_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+ libsystemd-bus.la
test_login_tables_SOURCES = \
src/login/test-login-tables.c
test_login_tables_SOURCES = \
src/login/test-login-tables.c