chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dbus-manager.c: log error, why switch-root is refused
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index ae58c16969da1e2b83e5b25028d1d920322e38b5..ff70223395b1e3e9c9d0376de30870deded29325 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-32,28
+32,28
@@
SUBDIRS = . po
.SECONDARY:
LIBUDEV_CURRENT=4
.SECONDARY:
LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=
2
+LIBUDEV_REVISION=
3
LIBUDEV_AGE=3
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
LIBUDEV_AGE=3
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
-LIBSYSTEMD_LOGIN_CURRENT=
5
+LIBSYSTEMD_LOGIN_CURRENT=
6
LIBSYSTEMD_LOGIN_REVISION=0
LIBSYSTEMD_LOGIN_REVISION=0
-LIBSYSTEMD_LOGIN_AGE=
5
+LIBSYSTEMD_LOGIN_AGE=
6
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=
9
+LIBSYSTEMD_DAEMON_REVISION=
10
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=2
0
+LIBSYSTEMD_ID128_REVISION=2
1
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_ID128_AGE=0
-LIBSYSTEMD_JOURNAL_CURRENT=
9
+LIBSYSTEMD_JOURNAL_CURRENT=
10
LIBSYSTEMD_JOURNAL_REVISION=0
LIBSYSTEMD_JOURNAL_REVISION=0
-LIBSYSTEMD_JOURNAL_AGE=
9
+LIBSYSTEMD_JOURNAL_AGE=
10
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
@@
-124,9
+124,15
@@
dbusinterface_DATA =
dist_dbussystemservice_DATA =
check_PROGRAMS =
check_DATA =
dist_dbussystemservice_DATA =
check_PROGRAMS =
check_DATA =
-noinst_tests=
-noinst_PROGRAMS = $(noinst_tests)
-TESTS = $(noinst_tests)
+tests=
+manual_tests =
+if ENABLE_TESTS
+noinst_PROGRAMS = $(manual_tests) $(tests)
+TESTS = $(tests)
+else
+noinst_PROGRAMS =
+TESTS =
+endif
udevlibexec_PROGRAMS =
AM_CPPFLAGS = \
udevlibexec_PROGRAMS =
AM_CPPFLAGS = \
@@
-325,6
+331,7
@@
systemd_analyze_LDADD = \
dist_bashcompletion_DATA = \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
dist_bashcompletion_DATA = \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
+ shell-completion/bash/systemd-analyze \
shell-completion/bash/udevadm
dist_tmpfiles_DATA = \
shell-completion/bash/udevadm
dist_tmpfiles_DATA = \
@@
-410,6
+417,7
@@
nodist_systemunit_DATA = \
units/systemd-remount-fs.service \
units/systemd-update-utmp-runlevel.service \
units/systemd-update-utmp-shutdown.service \
units/systemd-remount-fs.service \
units/systemd-update-utmp-runlevel.service \
units/systemd-update-utmp-shutdown.service \
+ units/systemd-tmpfiles-setup-dev.service \
units/systemd-tmpfiles-setup.service \
units/systemd-tmpfiles-clean.service \
units/systemd-ask-password-wall.service \
units/systemd-tmpfiles-setup.service \
units/systemd-tmpfiles-clean.service \
units/systemd-ask-password-wall.service \
@@
-454,6
+462,7
@@
EXTRA_DIST += \
units/systemd-remount-fs.service.in \
units/systemd-update-utmp-runlevel.service.in \
units/systemd-update-utmp-shutdown.service.in \
units/systemd-remount-fs.service.in \
units/systemd-update-utmp-runlevel.service.in \
units/systemd-update-utmp-shutdown.service.in \
+ units/systemd-tmpfiles-setup-dev.service.in \
units/systemd-tmpfiles-setup.service.in \
units/systemd-tmpfiles-clean.service.in \
units/systemd-ask-password-wall.service.in \
units/systemd-tmpfiles-setup.service.in \
units/systemd-tmpfiles-clean.service.in \
units/systemd-ask-password-wall.service.in \
@@
-558,7
+567,7
@@
noinst_DATA += \
CLEANFILES += \
man/index.html
CLEANFILES += \
man/index.html
-XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)
+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml
$(top_builddir)/man/*.xml
)
NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
SOURCE_XML_FILES = $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))
NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
SOURCE_XML_FILES = $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))
@@
-678,7
+687,9
@@
libsystemd_shared_la_SOURCES = \
src/shared/calendarspec.h \
src/shared/fileio.c \
src/shared/fileio.h \
src/shared/calendarspec.h \
src/shared/fileio.c \
src/shared/fileio.h \
- src/shared/output-mode.h
+ src/shared/output-mode.h \
+ src/shared/MurmurHash3.c \
+ src/shared/MurmurHash3.h
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
@@
-1059,7
+1070,7
@@
CLEANFILES += \
src/core/org.freedesktop.systemd1.policy.in
# ------------------------------------------------------------------------------
src/core/org.freedesktop.systemd1.policy.in
# ------------------------------------------------------------------------------
-
noinst_PROGRAMS
+= \
+
manual_tests
+= \
test-engine \
test-ns \
test-loopback \
test-engine \
test-ns \
test-loopback \
@@
-1070,7
+1081,7
@@
noinst_PROGRAMS += \
test-watchdog \
test-log
test-watchdog \
test-log
-
noinst_
tests += \
+tests += \
test-job-type \
test-env-replace \
test-strbuf \
test-job-type \
test-env-replace \
test-strbuf \
@@
-1141,7
+1152,7
@@
test_hostname_LDADD = \
libsystemd-core.la
if ENABLE_EFI
libsystemd-core.la
if ENABLE_EFI
-
noinst_PROGRAMS
+= \
+
manual_tests
+= \
test-efivars
test_efivars_SOURCES = \
test-efivars
test_efivars_SOURCES = \
@@
-1709,7
+1720,10
@@
libsystemd_bus_la_SOURCES = \
src/libsystemd-bus/bus-type.c \
src/libsystemd-bus/bus-type.h \
src/libsystemd-bus/bus-match.c \
src/libsystemd-bus/bus-type.c \
src/libsystemd-bus/bus-type.h \
src/libsystemd-bus/bus-match.c \
- src/libsystemd-bus/bus-match.h
+ src/libsystemd-bus/bus-match.h \
+ src/libsystemd-bus/bus-bloom.c \
+ src/libsystemd-bus/bus-bloom.h \
+ src/libsystemd-bus/kdbus.h
libsystemd_bus_la_LIBADD = \
libsystemd-id128-internal.la \
libsystemd_bus_la_LIBADD = \
libsystemd-id128-internal.la \
@@
-1719,12
+1733,13
@@
libsystemd_bus_la_LIBADD = \
noinst_LTLIBRARIES += \
libsystemd-bus.la
noinst_LTLIBRARIES += \
libsystemd-bus.la
-
noinst_
tests += \
+tests += \
test-bus-marshal \
test-bus-signature \
test-bus-chat \
test-bus-server \
test-bus-marshal \
test-bus-signature \
test-bus-chat \
test-bus-server \
- test-bus-match
+ test-bus-match \
+ test-bus-kernel
noinst_PROGRAMS += \
busctl
noinst_PROGRAMS += \
busctl
@@
-1785,6
+1800,17
@@
test_bus_match_LDADD = \
libsystemd-bus.la \
libsystemd-id128-internal.la
libsystemd-bus.la \
libsystemd-id128-internal.la
+test_bus_kernel_SOURCES = \
+ src/libsystemd-bus/test-bus-kernel.c
+
+test_bus_kernel_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_bus_kernel_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-bus.la \
+ libsystemd-id128-internal.la
+
busctl_SOURCES = \
src/libsystemd-bus/busctl.c
busctl_SOURCES = \
src/libsystemd-bus/busctl.c
@@
-2052,7
+2078,7
@@
TESTS += \
test/udev-test.pl \
test/rules-test.sh
test/udev-test.pl \
test/rules-test.sh
-
noinst_PROGRAMS
+= \
+
manual_tests
+= \
test-libudev \
test-udev
test-libudev \
test-udev
@@
-2505,7
+2531,7
@@
test_id128_LDADD = \
libsystemd-shared.la \
libsystemd-id128-internal.la
libsystemd-shared.la \
libsystemd-id128-internal.la
-
noinst_
tests += \
+tests += \
test-id128
pkginclude_HEADERS += \
test-id128
pkginclude_HEADERS += \
@@
-2813,10
+2839,10
@@
catalog-remove-hook:
UNINSTALL_DATA_HOOKS += \
catalog-remove-hook
UNINSTALL_DATA_HOOKS += \
catalog-remove-hook
-
noinst_PROGRAMS
+= \
+
manual_tests
+= \
test-journal-enum
test-journal-enum
-
noinst_
tests += \
+tests += \
test-journal \
test-journal-send \
test-journal-syslog \
test-journal \
test-journal-send \
test-journal-syslog \
@@
-3059,7
+3085,8
@@
systemd_bootchart_SOURCES = \
src/bootchart/svg.h
systemd_bootchart_LDADD = \
src/bootchart/svg.h
systemd_bootchart_LDADD = \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-journal.la
rootlibexec_PROGRAMS += \
systemd-bootchart
rootlibexec_PROGRAMS += \
systemd-bootchart
@@
-3438,8
+3465,8
@@
systemd_logind_CFLAGS = \
systemd_logind_LDADD = \
libsystemd-label.la \
systemd_logind_LDADD = \
libsystemd-label.la \
- libsystemd-shared.la \
libsystemd-audit.la \
libsystemd-audit.la \
+ libsystemd-shared.la \
libsystemd-daemon.la \
libsystemd-dbus.la \
libudev.la
libsystemd-daemon.la \
libsystemd-dbus.la \
libudev.la
@@
-3513,7
+3540,7
@@
test_inhibit_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS)
$(AM_CFLAGS) \
$(DBUS_CFLAGS)
-
noinst_PROGRAMS
+= \
+
manual_tests
+= \
test-login \
test-inhibit
test-login \
test-inhibit
@@
-3992,6
+4019,7
@@
SYSINIT_TARGET_WANTS += \
sys-kernel-config.mount \
sys-kernel-debug.mount \
sys-fs-fuse-connections.mount \
sys-kernel-config.mount \
sys-kernel-debug.mount \
sys-fs-fuse-connections.mount \
+ systemd-tmpfiles-setup-dev.service \
systemd-tmpfiles-setup.service \
systemd-sysctl.service \
systemd-ask-password-console.path
systemd-tmpfiles-setup.service \
systemd-sysctl.service \
systemd-ask-password-console.path