ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AM_MAKEFLAGS = --no-print-directory
+AUTOMAKE_OPTIONS = color-tests parallel-tests
SUBDIRS = . po
systemd-rc-local-generator
endif
-if TARGET_FRUGALWARE
-dist_systemunit_DATA += \
- units/frugalware/display-manager.service
-endif
-
if TARGET_SUSE
dist_systemunit_DATA += \
units/suse/rc-local.service \
man/systemd.kill.5 \
man/systemd.special.7 \
man/systemd.journal-fields.7 \
+ man/systemd.time.7 \
man/kernel-command-line.7 \
man/daemon.7 \
man/bootup.7 \
man/systemd-modules-load.8: man/systemd-modules-load.service.8
endif
+if HAVE_MICROHTTPD
+MANPAGES += \
+ man/systemd-journal-gatewayd.service.8
+MANPAGES_ALIAS += \
+ man/systemd-journal-gatewayd.socket.8 \
+ man/systemd-journal-gatewayd.8
+man/systemd-journal-gatewayd.socket.8: man/systemd-journal-gatewayd.service.8
+man/systemd-journal-gatewayd.8: man/systemd-journal-gatewayd.service.8
+endif
+
man/reboot.8: man/halt.8
man/poweroff.8: man/halt.8
man/init.1: man/systemd.1
man/systemd.kill.xml \
man/systemd.device.xml \
man/systemd.conf.xml \
- man/systemd.journal-fields.xml
+ man/systemd.journal-fields.xml \
+ man/systemd.time.xml
man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES)
$(AM_V_at)$(MKDIR_P) $(dir $@)
src/shared/virt.h \
src/shared/path-util.c \
src/shared/path-util.h \
+ src/shared/time-util.c \
+ src/shared/time-util.h \
src/shared/hashmap.c \
src/shared/hashmap.h \
src/shared/set.c \
src/shared/set.h \
+ src/shared/fdset.c \
+ src/shared/fdset.h \
src/shared/strv.c \
src/shared/strv.h \
src/shared/strbuf.c \
src/shared/hwclock.c \
src/shared/hwclock.h \
src/shared/time-dst.c \
- src/shared/time-dst.h
+ src/shared/time-dst.h \
+ src/shared/calendarspec.c \
+ src/shared/calendarspec.h
+
+libsystemd_shared_la_LIBADD = libsystemd-daemon.la
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
src/core/mount-setup.h \
src/core/loopback-setup.h \
src/core/loopback-setup.c \
- src/core/fdset.c \
- src/core/fdset.h \
src/core/condition.c \
src/core/condition.h \
src/core/namespace.c \
libsystemd-dbus.la \
libsystemd-audit.la \
libsystemd-id128-internal.la \
+ libsystemd-daemon.la \
libudev.la \
$(LIBWRAP_LIBS) \
$(PAM_LIBS) \
test-date \
test-sleep \
test-replace-var \
- test-sched-prio
+ test-sched-prio \
+ test-calendarspec \
+ test-strip-tab-ansi
TESTS += \
test-job-type \
test-date \
test-sleep \
test-replace-var \
- test-sched-prio
+ test-sched-prio \
+ test-calendarspec \
+ test-strip-tab-ansi
EXTRA_DIST += \
test/sched_idle_bad.service \
test_replace_var_LDADD = \
libsystemd-shared.la
+test_calendarspec_SOURCES = \
+ src/test/test-calendarspec.c
+
+test_calendarspec_LDADD = \
+ libsystemd-shared.la
+
+test_strip_tab_ansi_SOURCES = \
+ src/test/test-strip-tab-ansi.c
+
+test_strip_tab_ansi_LDADD = \
+ libsystemd-shared.la
+
test_daemon_SOURCES = \
src/test/test-daemon.c
hwdb/20-pci-classes.hwdb \
hwdb/20-usb-vendor-product.hwdb \
hwdb/20-usb-classes.hwdb \
+ hwdb/20-bluetooth-vendor-product.hwdb \
hwdb/20-acpi-vendor.hwdb \
hwdb/20-OUI.hwdb
keymaps/onkyo \
keymaps/oqo-model2 \
keymaps/samsung-other \
- keymaps/samsung-90x3a \
+ keymaps/samsung-series-9 \
keymaps/samsung-sq1us \
keymaps/samsung-sx20s \
keymaps/toshiba-satellite_a100 \
keymaps-force-release/dell-xps \
keymaps-force-release/hp-other \
keymaps-force-release/samsung-other \
- keymaps-force-release/samsung-90x3a \
+ keymaps-force-release/samsung-series-9 \
keymaps-force-release/common-volume-keys
src/udev/keymap/keys.txt: Makefile
src/login/logind-device.h \
src/login/logind-button.c \
src/login/logind-button.h \
+ src/login/logind-action.c \
+ src/login/logind-action.h \
src/login/logind-seat.c \
src/login/logind-seat.h \
src/login/logind-session.c \
endif
+EXTRA_DIST += \
+ shell-completion/systemd-zsh-completion.zsh
systemd-install-data-hook:
$(MKDIR_P) -m 0755 \
$(LN_S) rescue.service single.service )
endif
-if TARGET_DEBIAN_OR_UBUNTU
- ( cd $(DESTDIR)$(systemunitdir) && \
- rm -f runlevel5.target && \
- $(LN_S) multi-user.target runlevel5.target )
-endif
-
if TARGET_SUSE
( cd $(DESTDIR)$(systemunitdir) && \
rm -f local.service && \
clean-local:
rm -rf $(abs_srcdir)/install-tree
- rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt
+ rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt \
+ $(abs_srcdir)/hwdb/iab.txt
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
wget -N http://www.linux-usb.org/usb.ids && \
wget -N http://pci-ids.ucw.cz/v2.2/pci.ids && \
wget -N http://standards.ieee.org/develop/regauth/oui/oui.txt && \
+ wget -N http://standards.ieee.org/develop/regauth/iab/iab.txt && \
./ids-update.pl )
upload: all distcheck