SUBDIRS = . po
LIBUDEV_CURRENT=13
-LIBUDEV_REVISION=2
+LIBUDEV_REVISION=3
LIBUDEV_AGE=13
LIBGUDEV_CURRENT=1
-DX_SERVER=\"$(bindir)/X\" \
-DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \
-I $(top_srcdir)/src \
+ -I $(top_srcdir)/src/shared \
-I $(top_srcdir)/src/readahead \
-I $(top_srcdir)/src/login \
-I $(top_srcdir)/src/journal \
AM_CFLAGS = $(WARNINGFLAGS)
AM_LDFLAGS = $(GCLDFLAGS)
+# ------------------------------------------------------------------------------
if TARGET_GENTOO
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
endif
endif
+# ------------------------------------------------------------------------------
rootbin_PROGRAMS = \
systemctl \
systemd-notify \
test-cgroup \
test-env-replace \
test-strv \
- test-install
+ test-install \
+ test-watchdog
dist_pkgsysconf_DATA = \
src/system.conf \
noinst_LTLIBRARIES = \
libsystemd-basic.la \
+ libsystemd-capability.la \
+ libsystemd-audit.la \
libsystemd-core.la
+# ------------------------------------------------------------------------------
libsystemd_basic_la_SOURCES = \
- src/util.c \
- src/util.h \
- src/virt.c \
- src/virt.h \
- src/label.c \
- src/label.h \
- src/hashmap.c \
- src/hashmap.h \
- src/set.c \
- src/set.h \
- src/strv.c \
- src/strv.h \
- src/conf-parser.c \
- src/conf-parser.h \
- src/socket-util.c \
- src/socket-util.h \
- src/log.c \
- src/log.h \
- src/ratelimit.h \
- src/ratelimit.c \
- src/exit-status.c \
- src/exit-status.h \
- src/utf8.c \
- src/utf8.h
+ src/shared/util.c \
+ src/shared/util.h \
+ src/shared/virt.c \
+ src/shared/virt.h \
+ src/shared/label.c \
+ src/shared/label.h \
+ src/shared/hashmap.c \
+ src/shared/hashmap.h \
+ src/shared/set.c \
+ src/shared/set.h \
+ src/shared/strv.c \
+ src/shared/strv.h \
+ src/shared/conf-parser.c \
+ src/shared/conf-parser.h \
+ src/shared/socket-util.c \
+ src/shared/socket-util.h \
+ src/shared/log.c \
+ src/shared/log.h \
+ src/shared/ratelimit.h \
+ src/shared/ratelimit.c \
+ src/shared/exit-status.c \
+ src/shared/exit-status.h \
+ src/shared/utf8.c \
+ src/shared/utf8.h
libsystemd_basic_la_CFLAGS = \
$(AM_CFLAGS) \
$(SELINUX_CFLAGS)
libsystemd_basic_la_LIBADD = \
- $(SELINUX_LIBS) \
+ libsystemd-capability.la \
+ $(SELINUX_LIBS)
+
+# ------------------------------------------------------------------------------
+libsystemd_capability_la_SOURCES = \
+ src/shared/capability.c \
+ src/shared/capability.h
+
+libsystemd_capability_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(CAP_CFLAGS)
+
+libsystemd_capability_la_LIBADD = \
$(CAP_LIBS)
+# ------------------------------------------------------------------------------
+libsystemd_audit_la_SOURCES = \
+ src/shared/audit.c \
+ src/shared/audit.h
+
+libsystemd_audit_la_LIBADD = \
+ libsystemd-capability.la
+
+# ------------------------------------------------------------------------------
libsystemd_core_la_SOURCES = \
src/unit.c \
src/unit.h \
src/tcpwrap.h \
src/cgroup-attr.c \
src/cgroup-attr.h \
+ src/watchdog.c \
+ src/watchdog.h \
src/sd-daemon.c \
src/sd-id128.c \
src/macro.h \
$(CAP_LIBS) \
$(KMOD_LIBS)
+# ------------------------------------------------------------------------------
MANPAGES = \
man/systemd.1 \
man/systemctl.1 \
$(MANPAGES) \
$(MANPAGES_ALIAS)
+# ------------------------------------------------------------------------------
systemd_SOURCES = \
src/main.c
systemd_LDADD = \
libsystemd-core.la
+# ------------------------------------------------------------------------------
test_engine_SOURCES = \
src/test-engine.c
test_install_LDADD = \
libsystemd-basic.la
+test_watchdog_SOURCES = \
+ src/test-watchdog.c \
+ src/watchdog.c \
+ src/watchdog.h
+
+test_watchdog_LDADD = \
+ libsystemd-basic.la
+
+# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \
src/initctl.c \
src/dbus-common.c
libsystemd-daemon.la \
$(DBUS_LIBS)
+# ------------------------------------------------------------------------------
systemd_update_utmp_SOURCES = \
src/update-utmp.c \
src/dbus-common.c \
$(DBUS_LIBS) \
$(AUDIT_LIBS)
+# ------------------------------------------------------------------------------
systemd_shutdownd_SOURCES = \
src/utmp-wtmp.c \
src/shutdownd.c
systemd_shutdown_SOURCES = \
src/mount-setup.c \
src/umount.c \
- src/shutdown.c
+ src/shutdown.c \
+ src/watchdog.c \
+ src/watchdog.h
systemd_shutdown_LDADD = \
libsystemd-basic.la \
libudev.la
+# ------------------------------------------------------------------------------
systemd_modules_load_SOURCES = \
src/modules-load.c
libsystemd-basic.la \
$(KMOD_LIBS)
+# ------------------------------------------------------------------------------
systemd_tmpfiles_SOURCES = \
src/tmpfiles.c
systemd_tmpfiles_LDADD = \
libsystemd-basic.la
+# ------------------------------------------------------------------------------
systemd_machine_id_setup_SOURCES = \
src/machine-id-setup.c \
src/machine-id-main.c \
systemd_machine_id_setup_LDADD = \
libsystemd-basic.la
+# ------------------------------------------------------------------------------
systemd_sysctl_SOURCES = \
src/sysctl.c
systemd_sysctl_LDADD = \
libsystemd-basic.la
+# ------------------------------------------------------------------------------
systemd_fsck_SOURCES = \
src/fsck.c \
src/dbus-common.c
libudev.la \
$(DBUS_LIBS)
+# ------------------------------------------------------------------------------
systemd_timestamp_SOURCES = \
src/timestamp.c
systemd_timestamp_LDADD = \
libsystemd-basic.la
+# ------------------------------------------------------------------------------
systemd_ac_power_SOURCES = \
src/ac-power.c
libsystemd-basic.la \
libudev.la
+# ------------------------------------------------------------------------------
systemd_detect_virt_SOURCES = \
src/detect-virt.c
systemd_detect_virt_LDADD = \
libsystemd-basic.la
+# ------------------------------------------------------------------------------
systemd_getty_generator_SOURCES = \
src/getty-generator.c \
src/unit-name.c
systemd_getty_generator_LDADD = \
libsystemd-basic.la
+# ------------------------------------------------------------------------------
systemd_rc_local_generator_SOURCES = \
src/rc-local-generator.c
systemd_rc_local_generator_LDADD = \
libsystemd-basic.la
+# ------------------------------------------------------------------------------
systemd_remount_api_vfs_SOURCES = \
src/remount-api-vfs.c \
- src/mount-setup.c \
- src/exit-status.c
+ src/mount-setup.c
systemd_remount_api_vfs_LDADD = \
libsystemd-basic.la
+# ------------------------------------------------------------------------------
systemd_cgroups_agent_SOURCES = \
src/cgroups-agent.c \
src/dbus-common.c
libsystemd-basic.la \
$(DBUS_LIBS)
+# ------------------------------------------------------------------------------
systemctl_SOURCES = \
src/systemctl.c \
src/utmp-wtmp.c \
src/path-lookup.c \
src/cgroup-show.c \
src/cgroup-util.c \
- src/exit-status.c \
src/unit-name.c \
src/pager.c \
src/install.c \
libsystemd-id128.la \
$(DBUS_LIBS)
+# ------------------------------------------------------------------------------
systemd_notify_SOURCES = \
src/notify.c \
src/readahead/sd-readahead.c
libsystemd-basic.la \
libsystemd-daemon.la
+# ------------------------------------------------------------------------------
systemd_ask_password_SOURCES = \
src/ask-password.c \
src/ask-password-api.c
systemd_ask_password_LDADD = \
libsystemd-basic.la
+# ------------------------------------------------------------------------------
systemd_reply_password_SOURCES = \
src/reply-password.c
systemd_reply_password_LDADD = \
libsystemd-basic.la
+# ------------------------------------------------------------------------------
systemd_cgls_SOURCES = \
src/cgls.c \
src/cgroup-show.c \
systemd_cgls_LDADD = \
libsystemd-basic.la
+# ------------------------------------------------------------------------------
systemd_cgtop_SOURCES = \
src/cgtop.c \
src/cgroup-util.c
systemd_cgtop_LDADD = \
libsystemd-basic.la
+# ------------------------------------------------------------------------------
systemd_nspawn_SOURCES = \
src/nspawn.c \
src/cgroup-util.c \
systemd_nspawn_LDADD = \
libsystemd-basic.la \
+ libsystemd-capability.la \
libsystemd-daemon.la
+# ------------------------------------------------------------------------------
systemd_stdio_bridge_SOURCES = \
src/bridge.c
systemd_stdio_bridge_LDADD = \
libsystemd-basic.la
+# ------------------------------------------------------------------------------
systemd_tty_ask_password_agent_SOURCES = \
src/tty-ask-password-agent.c \
src/ask-password-api.c \
src/udev/udev-builtin-input_id.c \
src/udev/udev-builtin-kmod.c \
src/udev/udev-builtin-path_id.c \
- src/udev/udev-builtin-usb_id.c
+ src/udev/udev-builtin-usb_id.c \
+ src/systemd/sd-daemon.h \
+ src/sd-daemon.c
udev_common_CFLAGS = \
$(BLKID_CFLAGS) \
-DFIRMWARE_PATH="$(FIRMWARE_PATH)" \
-DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\"
+if HAVE_ACL
+udev_common_sources += \
+ src/udev/udev-builtin-uaccess.c \
+ src/login/logind-acl.c \
+ src/acl-util.c
+
+udev_common_CFLAGS += \
+ $(ACL_CFLAGS)
+
+udev_common_LDADD += \
+ libsystemd-login.la \
+ $(ACL_LIBS)
+endif
+
udevd_SOURCES = \
$(udev_common_sources) \
- src/udev/udevd.c \
- src/systemd/sd-daemon.h \
- src/sd-daemon.c
+ src/udev/udevd.c
udevd_CFLAGS = \
$(udev_common_CFLAGS)
udevd_LDADD = \
- $(udev_common_LDADD)
+ $(udev_common_LDADD) \
+ libsystemd-basic.la
udevd_CPPFLAGS = \
$(udev_common_CPPFLAGS)
$(udev_common_CFLAGS)
udevadm_LDADD = \
- $(udev_common_LDADD)
+ $(udev_common_LDADD) \
+ libsystemd-basic.la
udevadm_CPPFLAGS = \
$(udev_common_CPPFLAGS)
$(udev_common_CFLAGS)
test_udev_LDADD = \
- $(udev_common_LDADD)
+ $(udev_common_LDADD) \
+ libsystemd-basic.la
test_udev_CPPFLAGS = \
$(udev_common_CPPFLAGS)
src/udev/ata_id/ata_id.c
ata_id_LDADD = \
- libudev-private.la
+ libudev-private.la \
+ libsystemd-basic.la
udevlibexec_PROGRAMS += \
ata_id
src/udev/cdrom_id/cdrom_id.c
cdrom_id_LDADD = \
- libudev-private.la
+ libudev-private.la \
+ libsystemd-basic.la
udevlibexec_PROGRAMS += \
cdrom_id
src/udev/scsi_id/scsi_id.h
scsi_id_LDADD = \
- libudev-private.la
+ libudev-private.la \
+ libsystemd-basic.la
udevlibexec_PROGRAMS += \
scsi_id
src/udev/accelerometer/accelerometer.c
accelerometer_LDADD = \
- libudev-private.la -lm
+ libudev-private.la -lm \
+ libsystemd-basic.la
udevlibexec_PROGRAMS += \
accelerometer
src/udev/keymap/95-keyboard-force-release.rules
dist_udevhome_SCRIPTS = \
- src/udev/keymap/findkeyboards
-
-udevhome_SCRIPTS = \
+ src/udev/keymap/findkeyboards \
src/udev/keymap/keyboard-force-release.sh
EXTRA_DIST += \
- src/udev/keymap/check-keymaps.sh \
- src/udev/keymap/keyboard-force-release.sh.in
+ src/udev/keymap/check-keymaps.sh
CLEANFILES += \
$(nodist_keymap_SOURCES) \
src/udev/keymap/keys.txt \
- src/udev/keymap/keys-from-name.gperf \
- src/udev/keymap/keyboard-force-release.sh
+ src/udev/keymap/keys-from-name.gperf
udevkeymapdir = $(libexecdir)/udev/keymaps
dist_udevkeymap_DATA = \
systemd_journald_LDADD = \
libsystemd-basic.la \
+ libsystemd-audit.la \
libsystemd-daemon.la \
libsystemd-login.la \
$(ACL_LIBS)
systemd_logind_LDADD = \
libsystemd-basic.la \
+ libsystemd-audit.la \
libsystemd-daemon.la \
libudev.la \
$(DBUS_LIBS) \
rootlibexec_PROGRAMS += \
systemd-multi-seat-x
-systemd_uaccess_SOURCES = \
- src/login/uaccess.c
-
-if HAVE_ACL
-systemd_uaccess_SOURCES += \
- src/login/logind-acl.c \
- src/acl-util.c
-endif
-
-systemd_uaccess_CFLAGS = \
- $(AM_CFLAGS) \
- $(ACL_CFLAGS)
-
-systemd_uaccess_LDADD = \
- libsystemd-basic.la \
- libsystemd-daemon.la \
- libsystemd-login.la \
- libudev.la \
- $(ACL_LIBS)
-
-rootlibexec_PROGRAMS += \
- systemd-uaccess
-
dist_udevrules_DATA += \
src/login/70-uaccess.rules