chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: use proper ITERATOR_FIRST abstraction
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 58e5ce6c547152814758b9aa5d9d78c9628224b1..5dc17f8fe765e93e3062b7187e35ed2dd1118b9c 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-24,6
+24,9
@@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AM_MAKEFLAGS = --no-print-directory
AUTOMAKE_OPTIONS = color-tests parallel-tests
AM_MAKEFLAGS = --no-print-directory
AUTOMAKE_OPTIONS = color-tests parallel-tests
+GCC_COLORS ?= 'ooh, shiny!'
+export GCC_COLORS
+
SUBDIRS = . po
# remove targets if the command fails
SUBDIRS = . po
# remove targets if the command fails
@@
-140,6
+143,7
@@
nodist_pkgsysconf_DATA =
dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
dist_dbussystemservice_DATA =
dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
dist_dbussystemservice_DATA =
+dist_systemunit_DATA_busnames =
check_PROGRAMS =
check_DATA =
tests=
check_PROGRAMS =
check_DATA =
tests=
@@
-263,10
+267,12
@@
install-target-wants-hook:
what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants)
what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants)
what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants)
what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants)
what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants)
what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants)
- what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
+
+install-busnames-target-wants-hook:
+ what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
what="$(USER_BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(userunitdir) && $(add-wants)
define add-wants
what="$(USER_BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(userunitdir) && $(add-wants)
define add-wants
@@
-316,6
+322,11
@@
INSTALL_EXEC_HOOKS += \
install-aliases-hook \
install-touch-usr-hook
install-aliases-hook \
install-touch-usr-hook
+if ENABLE_KDBUS
+INSTALL_EXEC_HOOKS += \
+ install-busnames-target-wants-hook
+endif
+
# ------------------------------------------------------------------------------
AM_V_M4 = $(AM_V_M4_$(V))
AM_V_M4_ = $(AM_V_M4_$(AM_DEFAULT_VERBOSITY))
# ------------------------------------------------------------------------------
AM_V_M4 = $(AM_V_M4_$(V))
AM_V_M4_ = $(AM_V_M4_$(AM_DEFAULT_VERBOSITY))
@@
-451,7
+462,6
@@
dist_systemunit_DATA = \
units/network-online.target \
units/nss-lookup.target \
units/nss-user-lookup.target \
units/network-online.target \
units/nss-lookup.target \
units/nss-user-lookup.target \
- units/hybrid-sleep.target \
units/poweroff.target \
units/reboot.target \
units/rescue.target \
units/poweroff.target \
units/reboot.target \
units/rescue.target \
@@
-463,7
+473,6
@@
dist_systemunit_DATA = \
units/sigpwr.target \
units/sleep.target \
units/sockets.target \
units/sigpwr.target \
units/sleep.target \
units/sockets.target \
- units/busnames.target \
units/timers.target \
units/paths.target \
units/suspend.target \
units/timers.target \
units/paths.target \
units/suspend.target \
@@
-491,6
+500,14
@@
dist_systemunit_DATA = \
units/system-update.target \
units/initrd-switch-root.target
units/system-update.target \
units/initrd-switch-root.target
+if ENABLE_KDBUS
+dist_systemunit_DATA += \
+ $(dist_systemunit_DATA_busnames)
+endif
+
+dist_systemunit_DATA_busnames += \
+ units/busnames.target
+
nodist_systemunit_DATA = \
units/getty@.service \
units/serial-getty@.service \
nodist_systemunit_DATA = \
units/getty@.service \
units/serial-getty@.service \
@@
-508,7
+525,6
@@
nodist_systemunit_DATA = \
units/emergency.service \
units/rescue.service \
units/user@.service \
units/emergency.service \
units/rescue.service \
units/user@.service \
- units/systemd-hybrid-sleep.service \
units/systemd-suspend.service \
units/systemd-halt.service \
units/systemd-poweroff.service \
units/systemd-suspend.service \
units/systemd-halt.service \
units/systemd-poweroff.service \
@@
-564,7
+580,6
@@
EXTRA_DIST += \
units/systemd-fsck-root.service.in \
units/user@.service.in \
units/debug-shell.service.in \
units/systemd-fsck-root.service.in \
units/user@.service.in \
units/debug-shell.service.in \
- units/systemd-hybrid-sleep.service.in \
units/systemd-suspend.service.in \
units/quotaon.service.in \
units/initrd-parse-etc.service.in \
units/systemd-suspend.service.in \
units/quotaon.service.in \
units/initrd-parse-etc.service.in \
@@
-1011,6
+1026,10
@@
libsystemd_core_la_SOURCES = \
src/core/socket.h \
src/core/busname.c \
src/core/busname.h \
src/core/socket.h \
src/core/busname.c \
src/core/busname.h \
+ src/core/bus-common.c \
+ src/core/bus-common.h \
+ src/core/bus-endpoint.c \
+ src/core/bus-endpoint.h \
src/core/target.c \
src/core/target.h \
src/core/snapshot.c \
src/core/target.c \
src/core/target.h \
src/core/snapshot.c \
@@
-2140,36
+2159,38
@@
systemd_system_update_generator_LDADD = \
# ------------------------------------------------------------------------------
if ENABLE_HIBERNATE
systemgenerator_PROGRAMS += \
# ------------------------------------------------------------------------------
if ENABLE_HIBERNATE
systemgenerator_PROGRAMS += \
-
systemd-hibernate-resume-generator
+ systemd-hibernate-resume-generator
rootlibexec_PROGRAMS += \
rootlibexec_PROGRAMS += \
-
systemd-hibernate-resume
+ systemd-hibernate-resume
systemd_hibernate_resume_SOURCES = \
systemd_hibernate_resume_SOURCES = \
-
src/hibernate-resume/hibernate-resume.c
+ src/hibernate-resume/hibernate-resume.c
systemd_hibernate_resume_LDADD = \
systemd_hibernate_resume_LDADD = \
-
libsystemd-internal.la \
-
libsystemd-shared.la
+ libsystemd-internal.la \
+ libsystemd-shared.la
systemd_hibernate_resume_generator_SOURCES = \
systemd_hibernate_resume_generator_SOURCES = \
- src/
resume-generator/
resume-generator.c
+ src/
hibernate-resume/hibernate-
resume-generator.c
systemd_hibernate_resume_generator_LDADD = \
libsystemd-label.la \
libsystemd-shared.la
EXTRA_DIST += \
systemd_hibernate_resume_generator_LDADD = \
libsystemd-label.la \
libsystemd-shared.la
EXTRA_DIST += \
- units/systemd-hibernate.service.in \
- units/systemd-hibernate-resume@.service.in
+ units/systemd-hibernate.service.in \
+ units/systemd-hibernate-resume@.service.in \
+ units/systemd-hybrid-sleep.service.in
dist_systemunit_DATA += \
dist_systemunit_DATA += \
- units/hibernate.target
+ units/hibernate.target \
+ units/hybrid-sleep.target
nodist_systemunit_DATA += \
nodist_systemunit_DATA += \
-
units/systemd-hibernate.service \
- units/systemd-hibernate-resume@.service
-
+ units/systemd-hibernate.service \
+ units/systemd-hibernate-resume@.service \
+ units/systemd-hybrid-sleep.service
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
@@
-4486,7
+4507,7
@@
rootlibexec_PROGRAMS += \
nodist_systemunit_DATA += \
units/systemd-hostnamed.service
nodist_systemunit_DATA += \
units/systemd-hostnamed.service
-dist_systemunit_DATA += \
+dist_systemunit_DATA
_busnames
+= \
units/org.freedesktop.hostname1.busname
dist_dbuspolicy_DATA += \
units/org.freedesktop.hostname1.busname
dist_dbuspolicy_DATA += \
@@
-4529,13
+4550,11
@@
EXTRA_DIST += \
units/systemd-hostnamed.service.in
# ------------------------------------------------------------------------------
units/systemd-hostnamed.service.in
# ------------------------------------------------------------------------------
-if ENABLE_KDBUS
-dist_systemunit_DATA += \
+dist_systemunit_DATA_busnames += \
units/org.freedesktop.systemd1.busname
BUSNAMES_TARGET_WANTS += \
org.freedesktop.systemd1.busname
units/org.freedesktop.systemd1.busname
BUSNAMES_TARGET_WANTS += \
org.freedesktop.systemd1.busname
-endif
# ------------------------------------------------------------------------------
if ENABLE_LOCALED
# ------------------------------------------------------------------------------
if ENABLE_LOCALED
@@
-4550,7
+4569,7
@@
systemd_localed_LDADD = \
nodist_systemunit_DATA += \
units/systemd-localed.service
nodist_systemunit_DATA += \
units/systemd-localed.service
-dist_systemunit_DATA += \
+dist_systemunit_DATA
_busnames
+= \
units/org.freedesktop.locale1.busname
rootlibexec_PROGRAMS += \
units/org.freedesktop.locale1.busname
rootlibexec_PROGRAMS += \
@@
-4625,7
+4644,7
@@
dist_dbuspolicy_DATA += \
nodist_systemunit_DATA += \
units/systemd-timedated.service
nodist_systemunit_DATA += \
units/systemd-timedated.service
-dist_systemunit_DATA += \
+dist_systemunit_DATA
_busnames
+= \
units/org.freedesktop.timedate1.busname
polkitpolicy_files += \
units/org.freedesktop.timedate1.busname
polkitpolicy_files += \
@@
-4787,7
+4806,9
@@
nodist_systemunit_DATA += \
units/systemd-machined.service
dist_systemunit_DATA += \
units/systemd-machined.service
dist_systemunit_DATA += \
- units/machine.slice \
+ units/machine.slice
+
+dist_systemunit_DATA_busnames += \
units/org.freedesktop.machine1.busname
dist_dbussystemservice_DATA += \
units/org.freedesktop.machine1.busname
dist_dbussystemservice_DATA += \
@@
-4897,7
+4918,7
@@
rootlibexec_PROGRAMS += \
nodist_systemunit_DATA += \
units/systemd-resolved.service
nodist_systemunit_DATA += \
units/systemd-resolved.service
-dist_systemunit_DATA += \
+dist_systemunit_DATA
_busnames
+= \
units/org.freedesktop.resolve1.busname
dist_dbuspolicy_DATA += \
units/org.freedesktop.resolve1.busname
dist_dbuspolicy_DATA += \
@@
-5289,7
+5310,9
@@
nodist_systemunit_DATA += \
units/systemd-user-sessions.service
dist_systemunit_DATA += \
units/systemd-user-sessions.service
dist_systemunit_DATA += \
- units/user.slice \
+ units/user.slice
+
+dist_systemunit_DATA_busnames += \
units/org.freedesktop.login1.busname
dist_dbussystemservice_DATA += \
units/org.freedesktop.login1.busname
dist_dbussystemservice_DATA += \
@@
-5903,7
+5926,6
@@
SYSTEM_UNIT_ALIASES += \
USER_UNIT_ALIASES += \
$(systemunitdir)/shutdown.target shutdown.target \
$(systemunitdir)/sockets.target sockets.target \
USER_UNIT_ALIASES += \
$(systemunitdir)/shutdown.target shutdown.target \
$(systemunitdir)/sockets.target sockets.target \
- $(systemunitdir)/busnames.target busnames.target \
$(systemunitdir)/timers.target timers.target \
$(systemunitdir)/paths.target paths.target \
$(systemunitdir)/bluetooth.target bluetooth.target \
$(systemunitdir)/timers.target timers.target \
$(systemunitdir)/paths.target paths.target \
$(systemunitdir)/bluetooth.target bluetooth.target \
@@
-5911,6
+5933,11
@@
USER_UNIT_ALIASES += \
$(systemunitdir)/sound.target sound.target \
$(systemunitdir)/smartcard.target smartcard.target
$(systemunitdir)/sound.target sound.target \
$(systemunitdir)/smartcard.target smartcard.target
+if ENABLE_KDBUS
+USER_UNIT_ALIASES += \
+ $(systemunitdir)/busnames.target busnames.target
+endif
+
GENERAL_ALIASES += \
$(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
$(systemunitdir)/getty@.service $(pkgsysconfdir)/system/getty.target.wants/getty@tty1.service \
GENERAL_ALIASES += \
$(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
$(systemunitdir)/getty@.service $(pkgsysconfdir)/system/getty.target.wants/getty@tty1.service \