ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AM_MAKEFLAGS = --no-print-directory
+AUTOMAKE_OPTIONS = color-tests parallel-tests
SUBDIRS = . po
-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
-DROOTPREFIX=\"$(rootprefix)\" \
- -DRUNTIME_DIR=\"/run\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
AM_CFLAGS = $(OUR_CFLAGS)
AM_LDFLAGS = $(OUR_LDFLAGS)
-# ------------------------------------------------------------------------------
-if TARGET_GENTOO
-AM_CPPFLAGS += \
- -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
- -DKBD_SETFONT=\"/usr/bin/setfont\"
-else
-if TARGET_ARCH
-AM_CPPFLAGS += \
- -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
- -DKBD_SETFONT=\"/usr/bin/setfont\"
-else
-if TARGET_FRUGALWARE
-AM_CPPFLAGS += \
- -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
- -DKBD_SETFONT=\"/usr/bin/setfont\"
-else
-if TARGET_MANDRIVA
-AM_CPPFLAGS += \
- -DKBD_LOADKEYS=\"/bin/loadkeys\" \
- -DKBD_SETFONT=\"/bin/setfont\"
-else
-if TARGET_ANGSTROM
-AM_CPPFLAGS += \
- -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
- -DKBD_SETFONT=\"/usr/bin/setfont\"
-else
-if TARGET_MAGEIA
-AM_CPPFLAGS += \
- -DKBD_LOADKEYS=\"/bin/loadkeys\" \
- -DKBD_SETFONT=\"/bin/setfont\"
-else
-AM_CPPFLAGS += \
- -DKBD_LOADKEYS=\"/bin/loadkeys\" \
- -DKBD_SETFONT=\"/bin/setfont\"
-endif
-endif
-endif
-endif
-endif
-endif
-
# ------------------------------------------------------------------------------
rootbin_PROGRAMS = \
systemctl \
systemd-detect-virt \
systemd-delta
-dist_bin_SCRIPTS = \
- src/analyze/systemd-analyze
-
rootlibexec_PROGRAMS = \
systemd \
systemd-cgroups-agent \
systemd-fstab-generator \
systemd-system-update-generator
+dist_bin_SCRIPTS = \
+ src/analyze/systemd-analyze
+
+EXTRA_DIST += \
+ src/analyze/systemd-analyze.in
+
+CLEANFILES += \
+ src/analyze/systemd-analyze
+
dist_bashcompletion_DATA = \
shell-completion/systemd-bash-completion.sh
units/systemd-modules-load.service.in
endif
-if TARGET_FEDORA
-dist_systemunit_DATA += \
- units/fedora/rc-local.service \
- units/fedora/halt-local.service
-systemgenerator_PROGRAMS += \
- systemd-rc-local-generator
-endif
-
-if TARGET_MANDRIVA
-dist_systemunit_DATA += \
- units/fedora/rc-local.service \
- units/fedora/halt-local.service
-systemgenerator_PROGRAMS += \
- systemd-rc-local-generator
-endif
-
-if TARGET_FRUGALWARE
-dist_systemunit_DATA += \
- units/frugalware/display-manager.service
-endif
+if HAVE_SYSV_COMPAT
+nodist_systemunit_DATA += \
+ units/rc-local.service \
+ units/halt-local.service
-if TARGET_SUSE
-dist_systemunit_DATA += \
- units/suse/rc-local.service \
- units/suse/halt-local.service
-systemgenerator_PROGRAMS += \
- systemd-rc-local-generator
-endif
+EXTRA_DIST += \
+ units/rc-local.service.in \
+ units/halt-local.service.in
-if TARGET_MAGEIA
-dist_systemunit_DATA += \
- units/fedora/rc-local.service \
- units/fedora/halt-local.service
systemgenerator_PROGRAMS += \
systemd-rc-local-generator
endif
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
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/calendarspec.c \
src/shared/calendarspec.h
+libsystemd_shared_la_LIBADD = libsystemd-daemon.la
+
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
libsystemd-dbus.la
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-sleep \
test-replace-var \
test-sched-prio \
- test-calendarspec
+ test-calendarspec \
+ test-strip-tab-ansi
TESTS += \
test-job-type \
test-sleep \
test-replace-var \
test-sched-prio \
- test-calendarspec
+ test-calendarspec \
+ test-strip-tab-ansi
EXTRA_DIST += \
test/sched_idle_bad.service \
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
rules/75-net-description.rules \
rules/75-tty-description.rules \
rules/78-sound-card.rules \
+ rules/80-net-name-slot.rules \
rules/95-udev-late.rules
if HAVE_KMOD
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
dist_noinst_SCRIPT = \
src/locale/generate-kbd-model-map
-update-kbd-model-map:
- src/locale/generate-kbd-model-map > src/locale/kbd-model-map
+update-kbd-model-map: src/locale/generate-kbd-model-map
+ $PYTHON $< > src/locale/kbd-model-map
localectl_SOURCES = \
src/locale/localectl.c
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 \
-e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
-e 's,@SYSTEM_SYSVINIT_PATH\@,$(sysvinitdir),g' \
-e 's,@VARLOGDIR\@,$(varlogdir),g' \
+ -e 's,@RC_LOCAL_SCRIPT_PATH_START\@,$(RC_LOCAL_SCRIPT_PATH_START),g' \
+ -e 's,@RC_LOCAL_SCRIPT_PATH_STOP\@,$(RC_LOCAL_SCRIPT_PATH_STOP),g' \
+ -e 's,@PYTHON\@,$(PYTHON),g' \
+ -e 's,@PYTHON_BINARY\@,$(PYTHON_BINARY),g' \
< $< > $@
units/%: units/%.in Makefile
$(SED_PROCESS)
$(AM_V_GEN)chmod +x $@
+src/analyze/systemd-analyze: %: %.in Makefile
+ $(SED_PROCESS)
+ $(AM_V_GEN)chmod +x $@
+
src/%.c: src/%.gperf
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(GPERF) < $< > $@
$(LN_S) ../systemd-modules-load.service systemd-modules-load.service )
endif
-
-if TARGET_FEDORA
- ( cd $(DESTDIR)$(systemunitdir) && \
- rm -f display-manager.service single.service && \
- $(LN_S) rescue.service single.service )
-endif
-
-if TARGET_MANDRIVA
- ( cd $(DESTDIR)$(systemunitdir) && \
- rm -f display-manager.service dm.service single.service && \
- $(LN_S) rescue.service single.service )
-endif
-
-if TARGET_SUSE
- ( cd $(DESTDIR)$(systemunitdir) && \
- rm -f local.service && \
- $(LN_S) rc-local.service local.service )
-endif
-
-if TARGET_MAGEIA
- ( cd $(DESTDIR)$(systemunitdir) && \
- rm -f display-manager.service )
-endif
-
install-exec-hook: $(INSTALL_EXEC_HOOKS)
uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)
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) \
endif
hwdb-update:
- ( cd hwdb && \
- 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 && \
+ ( 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/iab/iab.txt && \
./ids-update.pl )
upload: all distcheck