# remove targets if the command fails
.DELETE_ON_ERROR:
-LIBUDEV_CURRENT=2
-LIBUDEV_REVISION=5
-LIBUDEV_AGE=1
+LIBUDEV_CURRENT=3
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=2
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=2
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=8
+LIBSYSTEMD_LOGIN_REVISION=9
LIBSYSTEMD_LOGIN_AGE=3
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=14
+LIBSYSTEMD_ID128_REVISION=15
LIBSYSTEMD_ID128_AGE=0
-LIBSYSTEMD_JOURNAL_CURRENT=5
-LIBSYSTEMD_JOURNAL_REVISION=4
-LIBSYSTEMD_JOURNAL_AGE=5
+LIBSYSTEMD_JOURNAL_CURRENT=6
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=6
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=$(sysconfdir)/bash_completion.d
rpmmacrosdir=$(sysconfdir)/rpm
+sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
+varlogdir=$(localstatedir)/log
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
udevlibexecdir=$(rootprefix)/lib/udev
udevhomedir = $(udevlibexecdir)
udevrulesdir = $(udevlibexecdir)/rules.d
+udevhwdbdir = $(udevlibexecdir)/hwdb.d
# And these are the special ones for /
rootprefix=@rootprefix@
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
-DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
systemd-system-update-generator
dist_bashcompletion_DATA = \
- bash-completion/systemd-bash-completion.sh
+ shell-completion/systemd-bash-completion.sh
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
units/nss-user-lookup.target \
units/mail-transfer-agent.target \
units/hibernate.target \
- units/http-daemon.target \
+ units/hybrid-sleep.target \
units/poweroff.target \
units/reboot.target \
units/rescue.target \
units/rescue.service \
units/user@.service \
units/systemd-hibernate.service \
+ units/systemd-hybrid-sleep.service \
units/systemd-suspend.service \
units/systemd-halt.service \
units/systemd-poweroff.service \
units/systemd-udev-settle.service \
units/debug-shell.service.in \
units/systemd-hibernate.service.in \
+ units/systemd-hybrid-sleep.service.in \
units/systemd-suspend.service.in \
units/quotaon.service.in \
introspect.awk \
man/journald.conf.5 \
man/systemd-journald.service.8 \
man/journalctl.1 \
+ man/systemd-coredumpctl.1 \
man/systemd-inhibit.1 \
man/systemd-remount-fs.service.8 \
man/systemd-update-utmp-runlevel.service.8 \
man/sd_journal_get_fd.3 \
man/sd_journal_get_usage.3 \
man/sd_journal_add_match.3 \
- man/sd_journal_seek_head.3
+ man/sd_journal_seek_head.3 \
+ man/sd_journal_query_unique.3
MANPAGES_ALIAS = \
man/reboot.8 \
man/systemd-shutdownd.socket.8 \
man/systemd-shutdownd.8 \
man/systemd-hibernate.service.8 \
+ man/systemd-hybrid-sleep.service.8 \
man/systemd-sleep.8 \
man/systemd-shutdown.8 \
man/systemd-poweroff.service.8 \
man/systemd-tmpfiles-clean.timer.8 \
man/sd_id128_t.3 \
man/SD_ID128_MAKE.3 \
+ man/SD_ID128_CONST_STR.3 \
man/SD_ID128_FORMAT_STR.3 \
man/SD_ID128_FORMAT_VAL.3 \
man/sd_id128_equal.3 \
man/SD_JOURNAL_FOREACH_DATA.3 \
man/sd_journal_get_monotonic_usec.3 \
man/sd_journal_get_cutoff_monotonic_usec.3 \
+ man/sd_journal_reliable_fd.3 \
man/sd_journal_process.3 \
man/sd_journal_wait.3 \
man/SD_JOURNAL_NOP.3 \
man/sd_journal_seek_monotonic_usec.3 \
man/sd_journal_seek_realtime_usec.3 \
man/sd_journal_seek_cursor.3 \
- man/sd_journal_test_cursor.3
+ man/sd_journal_test_cursor.3 \
+ man/sd_journal_enumerate_unique.3 \
+ man/sd_journal_restart_unique.3 \
+ man/SD_JOURNAL_FOREACH_UNIQUE.3
man/reboot.8: man/halt.8
man/poweroff.8: man/halt.8
man/systemd-shutdownd.socket.8: man/systemd-shutdownd.service.8
man/systemd-shutdownd.8: man/systemd-shutdownd.service.8
man/systemd-hibernate.service.8: man/systemd-suspend.service.8
+man/systemd-hybrid-sleep.service.8: man/systemd-suspend.service.8
man/systemd-sleep.8: man/systemd-suspend.service.8
man/systemd-shutdown.8: man/systemd-halt.service.8
man/systemd-poweroff.service.8: man/systemd-halt.service.8
man/systemd-tmpfiles-clean.timer.8: man/systemd-tmpfiles.8
man/sd_id128_t.3: man/sd-id128.3
man/SD_ID128_MAKE.3: man/sd-id128.3
+man/SD_ID128_CONST_STR.3: man/sd-id128.3
man/SD_ID128_FORMAT_STR.3: man/sd-id128.3
man/SD_ID128_FORMAT_VAL.3: man/sd-id128.3
man/sd_id128_equal.3: man/sd-id128.3
man/SD_JOURNAL_FOREACH_DATA.3: man/sd_journal_get_data.3
man/sd_journal_get_monotonic_usec.3: man/sd_journal_get_realtime_usec.3
man/sd_journal_get_cutoff_monotonic_usec.3: man/sd_journal_get_cutoff_realtime_usec.3
+man/sd_journal_reliable_fd.3: man/sd_journal_get_fd.3
man/sd_journal_process.3: man/sd_journal_get_fd.3
man/sd_journal_wait.3: man/sd_journal_get_fd.3
man/SD_JOURNAL_NOP.3: man/sd_journal_get_fd.3
man/sd_journal_seek_realtime_usec.3: man/sd_journal_seek_head.3
man/sd_journal_seek_cursor.3: man/sd_journal_seek_head.3
man/sd_journal_test_cursor.3: man/sd_journal_get_cursor.3
+man/sd_journal_enumerate_unique.3: man/sd_journal_query_unique.3
+man/sd_journal_restart_unique.3: man/sd_journal_query_unique.3
+man/SD_JOURNAL_FOREACH_UNIQUE.3: man/sd_journal_query_unique.3
XML_FILES = \
${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
src/shared/list.h \
src/shared/macro.h \
src/shared/def.h \
+ src/shared/sparse-endian.h \
src/shared/util.c \
src/shared/util.h \
src/shared/virt.c \
src/shared/set.h \
src/shared/strv.c \
src/shared/strv.h \
+ src/shared/strbuf.c \
+ src/shared/strbuf.h \
src/shared/conf-parser.c \
src/shared/conf-parser.h \
src/shared/log.c \
src/shared/spawn-polkit-agent.c \
src/shared/spawn-polkit-agent.h \
src/shared/hwclock.c \
- src/shared/hwclock.h
+ src/shared/hwclock.h \
+ src/shared/time-dst.c \
+ src/shared/time-dst.h
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
test-unit-name \
test-log \
test-unit-file \
- test-date
+ test-date \
+ test-sleep
TESTS += \
test-job-type \
test-strv \
test-unit-name \
test-unit-file \
- test-data
+ test-date \
+ test-sleep
test_engine_SOURCES = \
src/test/test-engine.c
test_date_LDADD = \
libsystemd-core.la
+test_sleep_SOURCES = \
+ src/test/test-sleep.c
+
+test_sleep_LDADD = \
+ libsystemd-core.la
+
test_daemon_SOURCES = \
src/test/test-daemon.c
src/libudev/libudev-device.c \
src/libudev/libudev-enumerate.c \
src/libudev/libudev-monitor.c \
- src/libudev/libudev-queue.c
+ src/libudev/libudev-queue.c \
+ src/libudev/libudev-hwdb-def.h \
+ src/libudev/libudev-hwdb.c
libudev_la_CFLAGS = \
$(AM_CFLAGS) \
udev-confdirs:
-$(MKDIR_P) $(DESTDIR)$(sysconfdir)/udev/rules.d
+ -$(MKDIR_P) $(DESTDIR)$(sysconfdir)/udev/hwdb.d
INSTALL_DATA_HOOKS += udev-confdirs
rules/80-drivers.rules \
rules/95-udev-late.rules
+dist_udevhwdb_DATA = \
+ hwdb/20-pci-vendor-product.hwdb \
+ hwdb/20-usb-vendor-product.hwdb \
+ hwdb/20-acpi-vendor.hwdb
+
udevconfdir = $(sysconfdir)/udev
dist_udevconf_DATA = \
src/udev/udev.conf
libudev_core_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
- -DFIRMWARE_PATH="$(FIRMWARE_PATH)" \
- -DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\"
+ -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
if HAVE_ACL
libudev_core_la_SOURCES += \
src/udev/udevadm-info.c \
src/udev/udevadm-control.c \
src/udev/udevadm-monitor.c \
+ src/udev/udevadm-hwdb.c \
src/udev/udevadm-settle.c \
src/udev/udevadm-trigger.c \
src/udev/udevadm-test.c \
keymaps/hewlett-packard-presario-2100 \
keymaps/hewlett-packard-tablet \
keymaps/hewlett-packard-tx2 \
+ keymaps/hewlett-packard_elitebook-8440p \
keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
keymaps/inventec-symphony_6.0_7.0 \
keymaps/lenovo-3000 \
$(QRENCODE_LIBS)
endif
+systemd_coredumpctl_SOURCES = \
+ src/journal/coredumpctl.c
+
+systemd_coredumpctl_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-journal.la
+
test_journal_SOURCES = \
src/journal/test-journal.c
libsystemd-journal-internal.la \
libsystemd-id128-internal.la
+test_journal_syslog_SOURCES = \
+ src/journal/test-journal-syslog.c \
+ src/journal/journald-syslog.c
+
+test_journal_syslog_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
+
test_journal_match_SOURCES = \
src/journal/test-journal-match.c
libsystemd-journal-internal.la \
libsystemd-id128-internal.la
+test_journal_enum_SOURCES = \
+ src/journal/test-journal-enum.c
+
+test_journal_enum_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
+
test_journal_stream_SOURCES = \
src/journal/test-journal-stream.c
src/journal/lookup3.c \
src/journal/lookup3.h \
src/journal/journal-send.c \
- src/journal/sparse-endian.h \
src/journal/journal-def.h \
src/journal/compress.h \
src/journal/mmap-cache.c \
noinst_PROGRAMS += \
test-journal \
test-journal-send \
+ test-journal-syslog \
test-journal-match \
+ test-journal-enum \
test-journal-stream \
test-journal-verify \
test-mmap-cache
TESTS += \
test-journal \
+ test-journal-send \
+ test-journal-syslog \
test-journal-match \
test-journal-stream \
test-journal-verify \
journalctl
bin_PROGRAMS += \
+ systemd-coredumpctl \
systemd-cat
dist_systemunit_DATA += \
$(AM_CFLAGS) \
$(MICROHTTPD_CFLAGS)
-EXTRA_DIST += \
- units/systemd-journal-gatewayd.service.in
-
dist_systemunit_DATA += \
units/systemd-journal-gatewayd.socket
endif
+EXTRA_DIST += \
+ units/systemd-journal-gatewayd.service.in
+
# ------------------------------------------------------------------------------
if ENABLE_COREDUMP
systemd_coredump_SOURCES = \
man/systemd-hostnamed.8
man/systemd-hostnamed.8: man/systemd-hostnamed.service.8
+
+hostnamectl_SOURCES = \
+ src/hostname/hostnamectl.c
+
+hostnamectl_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+hostnamectl_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-dbus.la \
+ libsystemd-id128-internal.la
+
+bin_PROGRAMS += \
+ hostnamectl
+
+MANPAGES += \
+ man/hostnamectl.1
+
endif
polkitpolicy_in_files += \
update-kbd-model-map:
src/locale/generate-kbd-model-map > src/locale/kbd-model-map
+localectl_SOURCES = \
+ src/locale/localectl.c
+
+localectl_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+localectl_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-dbus.la \
+ libsystemd-id128-internal.la
+
+bin_PROGRAMS += \
+ localectl
+
+MANPAGES += \
+ man/localectl.1
+
endif
polkitpolicy_in_files += \
man/systemd-timedated.8
man/systemd-timedated.8: man/systemd-timedated.service.8
+
+timedatectl_SOURCES = \
+ src/timedate/timedatectl.c
+
+timedatectl_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+timedatectl_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-dbus.la
+
+bin_PROGRAMS += \
+ timedatectl
+
+MANPAGES += \
+ man/timedatectl.1
+
endif
polkitpolicy_in_files += \
-e 's,@rootprefix\@,$(rootprefix),g' \
-e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
-e 's,@sushell\@,$(sushell),g' \
+ -e 's,@KILL\@,$(KILL),g' \
-e 's,@QUOTAON\@,$(QUOTAON),g' \
-e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
+ -e 's,@SYSTEM_SYSVINIT_PATH\@,$(sysvinitdir),g' \
+ -e 's,@VARLOGDIR\@,$(varlogdir),g' \
< $< > $@
units/%: units/%.in Makefile
CLEANFILES += \
$(dbusinterface_DATA)
+if HAVE_SYSV_COMPAT
+sysvinit_DATA = \
+ docs/sysvinit/README
+
+varlog_DATA = \
+ docs/var-log/README
+
+docs/sysvinit/README: docs/sysvinit/README.in
+ $(SED_PROCESS)
+
+docs/var-log/README: docs/var-log/README.in
+ $(SED_PROCESS)
+
+EXTRA_DIST += \
+ docs/sysvinit/README.in \
+ docs/var-log/README.in
+
+CLEANFILES += \
+ docs/sysvinit/README \
+ docs/var-log/README
+
+endif
+
+
systemd-install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(tmpfilesdir) \
clean-local:
rm -rf $(abs_srcdir)/install-tree
+ rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids
DISTCHECK_CONFIGURE_FLAGS = \
+ --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
--enable-gtk-doc
endif
+hwdb-update:
+ ( cd hwdb && \
+ wget -N http://www.linux-usb.org/usb.ids && \
+ wget -N http://pciids.sourceforge.net/v2.2/pci.ids && \
+ ./ids-update.pl )
+
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/
~ianmdlvl / elogind.git / blobdiff