chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bootchart: properly terminate string
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index d8e9b16be071d57321e977e850647fb4f8259ad3..923f81bb20fd019d040018e80692f299794ac048 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-32,7
+32,7
@@
SUBDIRS = . po
.SECONDARY:
LIBUDEV_CURRENT=4
.SECONDARY:
LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=
0
+LIBUDEV_REVISION=
1
LIBUDEV_AGE=3
LIBGUDEV_CURRENT=1
LIBUDEV_AGE=3
LIBGUDEV_CURRENT=1
@@
-40,19
+40,19
@@
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=4
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=4
-LIBSYSTEMD_LOGIN_REVISION=
0
+LIBSYSTEMD_LOGIN_REVISION=
2
LIBSYSTEMD_LOGIN_AGE=4
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_LOGIN_AGE=4
LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=
7
+LIBSYSTEMD_DAEMON_REVISION=
8
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=1
7
+LIBSYSTEMD_ID128_REVISION=1
9
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=8
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=8
-LIBSYSTEMD_JOURNAL_REVISION=
0
+LIBSYSTEMD_JOURNAL_REVISION=
2
LIBSYSTEMD_JOURNAL_AGE=8
# Dirs of external packages
LIBSYSTEMD_JOURNAL_AGE=8
# Dirs of external packages
@@
-193,8
+193,8
@@
SHUTDOWN_TARGET_WANTS =
LOCAL_FS_TARGET_WANTS =
MULTI_USER_TARGET_WANTS =
SYSINIT_TARGET_WANTS =
LOCAL_FS_TARGET_WANTS =
MULTI_USER_TARGET_WANTS =
SYSINIT_TARGET_WANTS =
-BASIC_TARGET_WANTS =
SOCKETS_TARGET_WANTS =
SOCKETS_TARGET_WANTS =
+TIMERS_TARGET_WANTS =
SYSTEM_UNIT_ALIASES =
USER_UNIT_ALIASES =
SYSTEM_UNIT_ALIASES =
USER_UNIT_ALIASES =
@@
-211,8
+211,8
@@
install-target-wants-hook:
what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && $(add-wants)
what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && $(add-wants)
what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && $(add-wants)
what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && $(add-wants)
what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
- what="$(BASIC_TARGET_WANTS)" && wants=basic.target && $(add-wants)
what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
+ what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants)
define add-wants
[ -z "$$what" ] || ( \
define add-wants
[ -z "$$what" ] || ( \
@@
-356,6
+356,7
@@
dist_systemunit_DATA = \
units/remote-fs.target \
units/remote-fs-pre.target \
units/network.target \
units/remote-fs.target \
units/remote-fs-pre.target \
units/network.target \
+ units/network-online.target \
units/nss-lookup.target \
units/nss-user-lookup.target \
units/hibernate.target \
units/nss-lookup.target \
units/nss-user-lookup.target \
units/hibernate.target \
@@
-371,6
+372,8
@@
dist_systemunit_DATA = \
units/sigpwr.target \
units/sleep.target \
units/sockets.target \
units/sigpwr.target \
units/sleep.target \
units/sockets.target \
+ units/timers.target \
+ units/paths.target \
units/suspend.target \
units/swap.target \
units/systemd-initctl.socket \
units/suspend.target \
units/swap.target \
units/systemd-initctl.socket \
@@
-620,6
+623,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/set.h \
src/shared/fdset.c \
src/shared/fdset.h \
src/shared/set.h \
src/shared/fdset.c \
src/shared/fdset.h \
+ src/shared/prioq.c \
+ src/shared/prioq.h \
src/shared/strv.c \
src/shared/strv.h \
src/shared/env-util.c \
src/shared/strv.c \
src/shared/strv.h \
src/shared/env-util.c \
@@
-791,7
+796,8
@@
libsystemd_acl_la_CFLAGS = \
$(ACL_CFLAGS)
libsystemd_acl_la_LIBADD = \
$(ACL_CFLAGS)
libsystemd_acl_la_LIBADD = \
- $(ACL_LIBS)
+ $(ACL_LIBS) \
+ libsystemd-shared.la
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
@@
-1075,7
+1081,8
@@
noinst_tests += \
test-sched-prio \
test-calendarspec \
test-strip-tab-ansi \
test-sched-prio \
test-calendarspec \
test-strip-tab-ansi \
- test-cgroup-util
+ test-cgroup-util \
+ test-prioq
EXTRA_DIST += \
test/sched_idle_bad.service \
EXTRA_DIST += \
test/sched_idle_bad.service \
@@
-1166,6
+1173,15
@@
test_util_CFLAGS = \
test_util_LDADD = \
libsystemd-core.la
test_util_LDADD = \
libsystemd-core.la
+test_prioq_SOURCES = \
+ src/test/test-prioq.c
+
+test_prioq_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_prioq_LDADD = \
+ libsystemd-core.la
+
test_log_SOURCES = \
src/test/test-log.c
test_log_SOURCES = \
src/test/test-log.c
@@
-1600,7
+1616,7
@@
libsystemd_daemon_la_SOURCES = \
src/libsystemd-daemon/sd-daemon.c
libsystemd_daemon_internal_la_SOURCES = \
src/libsystemd-daemon/sd-daemon.c
libsystemd_daemon_internal_la_SOURCES = \
-
$(libsystemd_daemon_la_SOURCES)
+ $(libsystemd_daemon_la_SOURCES)
libsystemd_daemon_la_CFLAGS = \
$(AM_CFLAGS) \
libsystemd_daemon_la_CFLAGS = \
$(AM_CFLAGS) \
@@
-1629,7
+1645,7
@@
lib_LTLIBRARIES += \
libsystemd-daemon.la
noinst_LTLIBRARIES += \
libsystemd-daemon.la
noinst_LTLIBRARIES += \
-
libsystemd-daemon-internal.la
+ libsystemd-daemon-internal.la
pkgconfiglib_DATA += \
src/libsystemd-daemon/libsystemd-daemon.pc
pkgconfiglib_DATA += \
src/libsystemd-daemon/libsystemd-daemon.pc
@@
-1648,17
+1664,21
@@
libsystemd_bus_la_SOURCES = \
src/libsystemd-bus/bus-error.h \
src/libsystemd-bus/bus-internal.c \
src/libsystemd-bus/bus-internal.h \
src/libsystemd-bus/bus-error.h \
src/libsystemd-bus/bus-internal.c \
src/libsystemd-bus/bus-internal.h \
+ src/libsystemd-bus/bus-socket.c \
+ src/libsystemd-bus/bus-socket.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 \
+ src/libsystemd-bus/bus-signature.h \
src/libsystemd-bus/bus-type.c \
src/libsystemd-bus/bus-type.h
libsystemd_bus_la_LIBADD = \
src/libsystemd-bus/bus-type.c \
src/libsystemd-bus/bus-type.h
libsystemd_bus_la_LIBADD = \
- libsystemd-id128-internal.la
+ libsystemd-id128-internal.la \
+ libsystemd-shared.la
noinst_LTLIBRARIES += \
noinst_LTLIBRARIES += \
-
libsystemd-bus.la
+ libsystemd-bus.la
noinst_tests += \
test-bus-marshal \
noinst_tests += \
test-bus-marshal \
@@
-1818,9
+1838,9
@@
dist_udevrules_DATA += \
rules/95-udev-late.rules
dist_udevhwdb_DATA = \
rules/95-udev-late.rules
dist_udevhwdb_DATA = \
- hwdb/20-pci-vendor-
product
.hwdb \
+ hwdb/20-pci-vendor-
model
.hwdb \
hwdb/20-pci-classes.hwdb \
hwdb/20-pci-classes.hwdb \
- hwdb/20-usb-vendor-
product
.hwdb \
+ hwdb/20-usb-vendor-
model
.hwdb \
hwdb/20-usb-classes.hwdb \
hwdb/20-bluetooth-vendor-product.hwdb \
hwdb/20-acpi-vendor.hwdb \
hwdb/20-usb-classes.hwdb \
hwdb/20-bluetooth-vendor-product.hwdb \
hwdb/20-acpi-vendor.hwdb \
@@
-2489,6
+2509,11
@@
journalctl_LDADD = \
libsystemd-id128-internal.la \
libsystemd-logs.la
libsystemd-id128-internal.la \
libsystemd-logs.la
+if HAVE_ACL
+journalctl_LDADD += \
+ libsystemd-acl.la
+endif
+
if HAVE_QRENCODE
journalctl_SOURCES += \
src/journal/journal-qrcode.c \
if HAVE_QRENCODE
journalctl_SOURCES += \
src/journal/journal-qrcode.c \
@@
-3570,7
+3595,7
@@
_journal_la_SOURCES = \
_journal_la_CFLAGS = \
$(AM_CFLAGS) \
_journal_la_CFLAGS = \
$(AM_CFLAGS) \
-
-fvisibility=default \
+ -fvisibility=default \
$(PYTHON_CFLAGS)
_journal_la_LDFLAGS = \
$(PYTHON_CFLAGS)
_journal_la_LDFLAGS = \
@@
-3591,7
+3616,7
@@
id128_la_SOURCES = \
id128_la_CFLAGS = \
$(AM_CFLAGS) \
id128_la_CFLAGS = \
$(AM_CFLAGS) \
-
-fvisibility=default \
+ -fvisibility=default \
$(PYTHON_CFLAGS) \
-I$(top_builddir)/src/python-systemd
$(PYTHON_CFLAGS) \
-I$(top_builddir)/src/python-systemd
@@
-3612,7
+3637,7
@@
_daemon_la_SOURCES = \
_daemon_la_CFLAGS = \
$(AM_CFLAGS) \
_daemon_la_CFLAGS = \
$(AM_CFLAGS) \
-
-fvisibility=default \
+ -fvisibility=default \
$(PYTHON_CFLAGS) \
-I$(top_builddir)/src/python-systemd
$(PYTHON_CFLAGS) \
-I$(top_builddir)/src/python-systemd
@@
-3633,7
+3658,7
@@
_reader_la_SOURCES = \
_reader_la_CFLAGS = \
$(AM_CFLAGS) \
_reader_la_CFLAGS = \
$(AM_CFLAGS) \
-
-fvisibility=default \
+ -fvisibility=default \
$(PYTHON_CFLAGS)
_reader_la_LDFLAGS = \
$(PYTHON_CFLAGS)
_reader_la_LDFLAGS = \
@@
-3660,8
+3685,7
@@
src/python-systemd/id128-constants.h: src/systemd/sd-messages.h Makefile
BUILT_SOURCES += \
src/python-systemd/id128-constants.h
BUILT_SOURCES += \
src/python-systemd/id128-constants.h
-PAPER = $(shell cat /etc/papersize 2>/dev/null || echo a4)
-SPHINXOPTS = -D latex_paper_size=$(PAPER) -D version=$(VERSION) -D release=$(VERSION)
+SPHINXOPTS = -D version=$(VERSION) -D release=$(VERSION)
sphinx-%:
$(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; }
$(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/docs/html/python-systemd/
sphinx-%:
$(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; }
$(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/docs/html/python-systemd/
@@
-3670,7
+3694,7
@@
sphinx-%:
destdir-sphinx: all
dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
$(MAKE) DESTDIR="$$dir" install && \
destdir-sphinx: all
dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
$(MAKE) DESTDIR="$$dir" install && \
- $(MAKE) DESTDIR="$$dir" sphinx-html && \
+ $(MAKE) DESTDIR="$$dir" sphinx-html && \
rm -rf "$$dir"
endif
rm -rf "$$dir"
endif
@@
-3712,7
+3736,8
@@
SED_PROCESS = \
-e 's,@VERSION\@,$(VERSION),g' \
-e 's,@rootprefix\@,$(rootprefix),g' \
-e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
-e 's,@VERSION\@,$(VERSION),g' \
-e 's,@rootprefix\@,$(rootprefix),g' \
-e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
- -e 's,@sushell\@,$(sushell),g' \
+ -e 's,@SUSHELL\@,$(SUSHELL),g' \
+ -e 's,@DEBUGTTY\@,$(DEBUGTTY),g' \
-e 's,@KILL\@,$(KILL),g' \
-e 's,@QUOTAON\@,$(QUOTAON),g' \
-e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
-e 's,@KILL\@,$(KILL),g' \
-e 's,@QUOTAON\@,$(QUOTAON),g' \
-e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
@@
-3893,7
+3918,7
@@
SYSINIT_TARGET_WANTS += \
systemd-tmpfiles-setup.service \
systemd-sysctl.service \
systemd-ask-password-console.path
systemd-tmpfiles-setup.service \
systemd-sysctl.service \
systemd-ask-password-console.path
-
BASIC
_TARGET_WANTS += \
+
TIMERS
_TARGET_WANTS += \
systemd-tmpfiles-clean.timer
if HAVE_SYSV_COMPAT
systemd-tmpfiles-clean.timer
if HAVE_SYSV_COMPAT
@@
-3915,9
+3940,12
@@
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)/timers.target timers.target \
+ $(systemunitdir)/paths.target paths.target \
$(systemunitdir)/bluetooth.target bluetooth.target \
$(systemunitdir)/printer.target printer.target \
$(systemunitdir)/bluetooth.target bluetooth.target \
$(systemunitdir)/printer.target printer.target \
- $(systemunitdir)/sound.target sound.target
+ $(systemunitdir)/sound.target sound.target \
+ $(systemunitdir)/smartcard.target smartcard.target
GENERAL_ALIASES += \
$(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
GENERAL_ALIASES += \
$(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
@@
-3941,6
+3969,8
@@
INSTALL_DIRS += \
$(sysconfdir)/modules-load.d \
$(prefix)/lib/sysctl.d \
$(sysconfdir)/sysctl.d \
$(sysconfdir)/modules-load.d \
$(prefix)/lib/sysctl.d \
$(sysconfdir)/sysctl.d \
+ $(prefix)/lib/kernel/install.d \
+ $(sysconfdir)/kernel/install.d \
$(systemshutdowndir) \
$(systemsleepdir) \
$(systemgeneratordir) \
$(systemshutdowndir) \
$(systemsleepdir) \
$(systemgeneratordir) \
@@
-3965,7
+3995,7
@@
distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
clean-local: $(CLEAN_LOCAL_HOOKS)
rm -rf $(abs_srcdir)/install-tree
rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt \
clean-local: $(CLEAN_LOCAL_HOOKS)
rm -rf $(abs_srcdir)/install-tree
rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt \
-
$(abs_srcdir)/hwdb/iab.txt
+ $(abs_srcdir)/hwdb/iab.txt
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
@@
-3996,7
+4026,7
@@
hwdb-update:
( cd $(top_srcdir)/hwdb && \
wget -N http://www.linux-usb.org/usb.ids \
http://pci-ids.ucw.cz/v2.2/pci.ids \
( cd $(top_srcdir)/hwdb && \
wget -N http://www.linux-usb.org/usb.ids \
http://pci-ids.ucw.cz/v2.2/pci.ids \
- http://standards.ieee.org/develop/regauth/oui/oui.txt \
+ http://standards.ieee.org/develop/regauth/oui/oui.txt \
http://standards.ieee.org/develop/regauth/iab/iab.txt && \
./ids-update.pl )
http://standards.ieee.org/develop/regauth/iab/iab.txt && \
./ids-update.pl )