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: avoid gcc warning about casting a pointer to int of different size
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index b63f9a053529d73a616fa0097f927e503b9ada1f..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=
1
+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=
4
-LIBSYSTEMD_LOGIN_REVISION=
2
-LIBSYSTEMD_LOGIN_AGE=
4
+LIBSYSTEMD_LOGIN_CURRENT=
6
+LIBSYSTEMD_LOGIN_REVISION=
0
+LIBSYSTEMD_LOGIN_AGE=
6
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=
8
+LIBSYSTEMD_DAEMON_REVISION=
10
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=
19
+LIBSYSTEMD_ID128_REVISION=
21
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_ID128_AGE=0
-LIBSYSTEMD_JOURNAL_CURRENT=
8
-LIBSYSTEMD_JOURNAL_REVISION=
2
-LIBSYSTEMD_JOURNAL_AGE=
8
+LIBSYSTEMD_JOURNAL_CURRENT=
10
+LIBSYSTEMD_JOURNAL_REVISION=
0
+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 = \
@@
-222,7
+228,7
@@
define add-wants
$(MKDIR_P) -m 0755 $$dir && \
cd $$dir && \
rm -f $$what && \
$(MKDIR_P) -m 0755 $$dir && \
cd $$dir && \
rm -f $$what && \
- for i in $$what; do
ln -s
../$$i . || exit $$? ; done )
+ for i in $$what; do
$(LN_S)
../$$i . || exit $$? ; done )
endef
install-directories-hook:
endef
install-directories-hook:
@@
-240,7
+246,7
@@
define install-aliases
$(MKDIR_P) /$(DESTDIR)$$dir && \
while [ -n "$$1" ]; do \
rm -f $(DESTDIR)$$dir/$$2 && \
$(MKDIR_P) /$(DESTDIR)$$dir && \
while [ -n "$$1" ]; do \
rm -f $(DESTDIR)$$dir/$$2 && \
-
ln -s
$$1 $(DESTDIR)$$dir/$$2 && \
+
$(LN_S)
$$1 $(DESTDIR)$$dir/$$2 && \
shift 2 || exit $$?; \
done
endef
shift 2 || exit $$?; \
done
endef
@@
-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 \
@@
-1088,7
+1099,8
@@
noinst_tests += \
test-strip-tab-ansi \
test-cgroup-util \
test-prioq \
test-strip-tab-ansi \
test-cgroup-util \
test-prioq \
- test-fileio
+ test-fileio \
+ test-time
EXTRA_DIST += \
test/sched_idle_bad.service \
EXTRA_DIST += \
test/sched_idle_bad.service \
@@
-1140,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 = \
@@
-1197,6
+1209,15
@@
test_fileio_CFLAGS = \
test_fileio_LDADD = \
libsystemd-core.la
test_fileio_LDADD = \
libsystemd-core.la
+test_time_SOURCES = \
+ src/test/test-time.c
+
+test_time_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_time_LDADD = \
+ libsystemd-core.la
+
test_log_SOURCES = \
src/test/test-log.c
test_log_SOURCES = \
src/test/test-log.c
@@
-1690,6
+1711,8
@@
libsystemd_bus_la_SOURCES = \
src/libsystemd-bus/bus-internal.h \
src/libsystemd-bus/bus-socket.c \
src/libsystemd-bus/bus-socket.h \
src/libsystemd-bus/bus-internal.h \
src/libsystemd-bus/bus-socket.c \
src/libsystemd-bus/bus-socket.h \
+ src/libsystemd-bus/bus-kernel.c \
+ src/libsystemd-bus/bus-kernel.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 \
@@
-1697,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 \
@@
-1707,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
@@
-1773,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
@@
-2040,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
@@
-2388,6
+2426,7
@@
dist_udevkeymap_DATA = \
keymaps/hewlett-packard-tablet \
keymaps/hewlett-packard-tx2 \
keymaps/hewlett-packard_elitebook-8440p \
keymaps/hewlett-packard-tablet \
keymaps/hewlett-packard-tx2 \
keymaps/hewlett-packard_elitebook-8440p \
+ keymaps/hewlett-packard_elitebook-8460p \
keymaps/hewlett-packard-hdx9494nr \
keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
keymaps/inventec-symphony_6.0_7.0 \
keymaps/hewlett-packard-hdx9494nr \
keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
keymaps/inventec-symphony_6.0_7.0 \
@@
-2492,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 += \
@@
-2800,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 \
@@
-3046,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
@@
-3425,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
@@
-3500,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
@@
-3542,7
+3582,6
@@
pam_systemd_la_LDFLAGS = \
-export-symbols-regex '^pam_sm_.*'
pam_systemd_la_LIBADD = \
-export-symbols-regex '^pam_sm_.*'
pam_systemd_la_LIBADD = \
- libsystemd-daemon.la \
libsystemd-audit.la \
libsystemd-dbus.la \
libsystemd-shared.la \
libsystemd-audit.la \
libsystemd-dbus.la \
libsystemd-shared.la \
@@
-3980,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
@@
-4095,6
+4135,10
@@
hwdb-update:
http://standards.ieee.org/develop/regauth/iab/iab.txt && \
./ids-update.pl )
http://standards.ieee.org/develop/regauth/iab/iab.txt && \
./ids-update.pl )
+kdbus-update:
+ ( cd $(top_srcdir)/src/libsystemd-bus/ && \
+ wget -N https://d-bus.googlecode.com/git/kdbus.h )
+
upload: all distcheck
cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
upload: all distcheck
cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/