X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=789e4420f3023be30903d1ca051bb47ad65c875e;hp=3357264a8584ab18dc4c64303c1c55b664193394;hb=78b2e3a632748fbeae8a9eb70ab1940e4a70619a;hpb=18b754d345ecb0b15e369978aaffa72e9814b86a diff --git a/Makefile.am b/Makefile.am index 3357264a8..789e4420f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # This file is part of systemd. # -# Copyright 2011 Lennart Poettering -# Copyright 2011 Kay Sievers +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers # # systemd is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -16,9 +16,18 @@ # You should have received a copy of the GNU General Public License # along with systemd; If not, see . -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} +AM_MAKEFLAGS = --no-print-directory -SUBDIRS = po +SUBDIRS = . po + +LIBUDEV_CURRENT=13 +LIBUDEV_REVISION=3 +LIBUDEV_AGE=13 + +LIBGUDEV_CURRENT=1 +LIBGUDEV_REVISION=1 +LIBGUDEV_AGE=1 LIBSYSTEMD_LOGIN_CURRENT=2 LIBSYSTEMD_LOGIN_REVISION=1 @@ -41,7 +50,6 @@ dbuspolicydir=@dbuspolicydir@ dbussessionservicedir=@dbussessionservicedir@ dbussystemservicedir=@dbussystemservicedir@ dbusinterfacedir=@dbusinterfacedir@ -udevrulesdir=@udevrulesdir@ pamlibdir=@pamlibdir@ pkgconfigdatadir=$(datadir)/pkgconfig pkgconfiglibdir=$(libdir)/pkgconfig @@ -55,28 +63,38 @@ tmpfilesdir=$(prefix)/lib/tmpfiles.d sysctldir=$(prefix)/lib/sysctl.d usergeneratordir=$(pkglibexecdir)/user-generators pkgincludedir=$(includedir)/systemd +systemgeneratordir=$(rootlibexecdir)/system-generators +systemshutdowndir=$(rootlibexecdir)/system-shutdown +systemunitdir=$(rootprefix)/lib/systemd/system +udevlibexecdir=$(rootprefix)/lib/udev +udevhomedir = $(libexecdir)/udev +udevrulesdir = $(libexecdir)/udev/rules.d # And these are the special ones for / rootprefix=@rootprefix@ rootbindir=$(rootprefix)/bin rootlibexecdir=$(rootprefix)/lib/systemd -systemgeneratordir=$(rootlibexecdir)/system-generators -systemshutdowndir=$(rootlibexecdir)/system-shutdown -systemunitdir=$(rootprefix)/lib/systemd/system CLEANFILES = EXTRA_DIST = +BUILT_SOURCES = INSTALL_EXEC_HOOKS = UNINSTALL_EXEC_HOOKS = INSTALL_DATA_HOOKS = +DISTCHECK_HOOKS = +DISTCLEAN_LOCAL_HOOKS = pkginclude_HEADERS = lib_LTLIBRARIES = +include_HEADERS = pkgconfiglib_DATA = polkitpolicy_in_files = dist_udevrules_DATA = +nodist_udevrules_DATA = +dist_man_MANS = 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)\" \ @@ -99,16 +117,20 @@ AM_CPPFLAGS = \ -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \ -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \ -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \ - -DX_SERVER=\"$(bindir)/X\" \ + -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 \ - -I $(top_srcdir)/src/systemd + -I $(top_srcdir)/src/systemd \ + -I $(top_srcdir)/src/udev AM_CFLAGS = $(WARNINGFLAGS) AM_LDFLAGS = $(GCLDFLAGS) +# ------------------------------------------------------------------------------ if TARGET_GENTOO AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ @@ -163,6 +185,7 @@ endif endif endif +# ------------------------------------------------------------------------------ rootbin_PROGRAMS = \ systemctl \ systemd-notify \ @@ -209,7 +232,8 @@ noinst_PROGRAMS = \ test-cgroup \ test-env-replace \ test-strv \ - test-install + test-install \ + test-watchdog dist_pkgsysconf_DATA = \ src/system.conf \ @@ -221,9 +245,6 @@ dist_dbuspolicy_DATA = \ dist_dbussystemservice_DATA = \ src/org.freedesktop.systemd1.service -nodist_udevrules_DATA = \ - src/99-systemd.rules - dbusinterface_DATA = \ org.freedesktop.systemd1.Manager.xml \ org.freedesktop.systemd1.Job.xml \ @@ -299,7 +320,9 @@ dist_systemunit_DATA = \ units/quotaon.service \ units/systemd-ask-password-wall.path \ units/systemd-ask-password-console.path \ - units/syslog.target + units/syslog.target \ + units/udev-control.socket \ + units/udev-kernel.socket nodist_systemunit_DATA = \ units/getty@.service \ @@ -317,13 +340,17 @@ nodist_systemunit_DATA = \ units/systemd-ask-password-console.service \ units/systemd-sysctl.service \ units/halt.service \ + units/emergency.service \ units/poweroff.service \ units/reboot.service \ units/kexec.service \ units/fsck@.service \ units/fsck-root.service \ units/rescue.service \ - units/user@.service + units/user@.service \ + units/udev.service \ + units/udev-trigger.service \ + units/udev-settle.service dist_userunit_DATA = \ units/user/default.target \ @@ -335,8 +362,8 @@ nodist_userunit_DATA = \ EXTRA_DIST += \ units/getty@.service.m4 \ units/serial-getty@.service.m4 \ - units/console-shell.service.m4 \ - units/rescue.service.m4 \ + units/console-shell.service.m4.in \ + units/rescue.service.m4.in \ units/systemd-initctl.service.in \ units/systemd-shutdownd.service.in \ units/systemd-modules-load.service.in \ @@ -348,6 +375,7 @@ EXTRA_DIST += \ units/systemd-ask-password-wall.service.in \ units/systemd-ask-password-console.service.in \ units/systemd-sysctl.service.in \ + units/emergency.service.in \ units/halt.service.in \ units/poweroff.service.in \ units/reboot.service.in \ @@ -356,9 +384,11 @@ EXTRA_DIST += \ units/fsck@.service.in \ units/fsck-root.service.in \ units/user@.service.in \ + units/udev.service \ + units/udev-trigger.service \ + units/udev-settle.service \ src/systemd.pc.in \ introspect.awk \ - src/99-systemd.rules.in \ man/custom-html.xsl if TARGET_FEDORA @@ -422,7 +452,7 @@ endif dist_doc_DATA = \ README \ - NEWS \ + NEWS \ LICENSE \ DISTRO_PORTING @@ -445,179 +475,188 @@ EXTRA_DIST += \ noinst_LTLIBRARIES = \ libsystemd-basic.la \ + libsystemd-capability.la \ + libsystemd-audit.la \ + libsystemd-acl.la \ libsystemd-core.la +# ------------------------------------------------------------------------------ libsystemd_basic_la_SOURCES = \ - src/util.c \ - src/virt.c \ - src/label.c \ - src/hashmap.c \ - src/set.c \ - src/strv.c \ - src/conf-parser.c \ - src/socket-util.c \ - src/log.c \ - src/ratelimit.c \ - src/exit-status.c \ - src/utf8.c + 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_core_la_SOURCES = \ - src/unit.c \ - src/job.c \ - src/manager.c \ - src/path-lookup.c \ - src/load-fragment.c \ - src/service.c \ - src/automount.c \ - src/mount.c \ - src/swap.c \ - src/device.c \ - src/target.c \ - src/snapshot.c \ - src/socket.c \ - src/timer.c \ - src/path.c \ - src/load-dropin.c \ - src/execute.c \ - src/utmp-wtmp.c \ - src/dbus.c \ - src/dbus-manager.c \ - src/dbus-unit.c \ - src/dbus-job.c \ - src/dbus-service.c \ - src/dbus-socket.c \ - src/dbus-timer.c \ - src/dbus-target.c \ - src/dbus-mount.c \ - src/dbus-automount.c \ - src/dbus-swap.c \ - src/dbus-snapshot.c \ - src/dbus-device.c \ - src/dbus-execute.c \ - src/dbus-path.c \ - src/cgroup.c \ - src/mount-setup.c \ - src/hostname-setup.c \ - src/selinux-setup.c \ - src/ima-setup.c \ - src/loopback-setup.c \ - src/kmod-setup.c \ - src/locale-setup.c \ - src/machine-id-setup.c \ - src/specifier.c \ - src/unit-name.c \ - src/fdset.c \ - src/namespace.c \ - src/tcpwrap.c \ - src/cgroup-util.c \ - src/condition.c \ - src/dbus-common.c \ - src/sd-daemon.c \ - src/install.c \ - src/cgroup-attr.c \ - src/sd-id128.c +# ------------------------------------------------------------------------------ +libsystemd_audit_la_SOURCES = \ + src/shared/audit.c \ + src/shared/audit.h -nodist_libsystemd_core_la_SOURCES = \ - src/load-fragment-gperf.c \ - src/load-fragment-gperf-nulstr.c +libsystemd_audit_la_LIBADD = \ + libsystemd-capability.la -EXTRA_DIST += \ - src/load-fragment-gperf.gperf.m4 +# ------------------------------------------------------------------------------ +libsystemd_acl_la_SOURCES = \ + src/shared/acl.c \ + src/shared/acl.h -libsystemd_core_la_CFLAGS = \ +libsystemd_acl_la_CFLAGS = \ $(AM_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(UDEV_CFLAGS) \ - $(LIBWRAP_CFLAGS) \ - $(PAM_CFLAGS) \ - $(AUDIT_CFLAGS) \ - $(KMOD_CFLAGS) - -libsystemd_core_la_LIBADD = \ - libsystemd-basic.la \ - $(DBUS_LIBS) \ - $(UDEV_LIBS) \ - $(LIBWRAP_LIBS) \ - $(PAM_LIBS) \ - $(AUDIT_LIBS) \ - $(CAP_LIBS) \ - $(KMOD_LIBS) + $(ACL_CFLAGS) -# This is needed because automake is buggy in how it generates the -# rules for C programs, but not Vala programs. We therefore can't -# list the .h files as dependencies if we want make dist to work. +libsystemd_acl_la_LIBADD = \ + $(ACL_LIBS) -EXTRA_DIST += \ - src/util.h \ - src/virt.h \ - src/label.h \ - src/hashmap.h \ - src/set.h \ - src/strv.h \ - src/conf-parser.h \ - src/socket-util.h \ - src/log.h \ - src/ratelimit.h \ - src/exit-status.h \ +# ------------------------------------------------------------------------------ +libsystemd_core_la_SOURCES = \ + src/unit.c \ src/unit.h \ + src/job.c \ src/job.h \ + src/manager.c \ src/manager.h \ + src/path-lookup.c \ src/path-lookup.h \ + src/load-fragment.c \ src/load-fragment.h \ + src/service.c \ src/service.h \ + src/automount.c \ src/automount.h \ + src/mount.c \ src/mount.h \ + src/swap.c \ src/swap.h \ + src/device.c \ src/device.h \ + src/target.c \ src/target.h \ + src/snapshot.c \ src/snapshot.h \ + src/socket.c \ src/socket.h \ + src/timer.c \ src/timer.h \ + src/path.c \ src/path.h \ + src/load-dropin.c \ src/load-dropin.h \ + src/execute.c \ src/execute.h \ + src/utmp-wtmp.c \ src/utmp-wtmp.h \ + src/dbus.c \ src/dbus.h \ + src/dbus-manager.c \ src/dbus-manager.h \ + src/dbus-unit.c \ src/dbus-unit.h \ + src/dbus-job.c \ src/dbus-job.h \ + src/dbus-service.c \ src/dbus-service.h \ + src/dbus-socket.c \ src/dbus-socket.h \ + src/dbus-timer.c \ src/dbus-timer.h \ + src/dbus-target.c \ src/dbus-target.h \ + src/dbus-mount.c \ src/dbus-mount.h \ + src/dbus-automount.c \ src/dbus-automount.h \ + src/dbus-swap.c \ src/dbus-swap.h \ + src/dbus-snapshot.c \ src/dbus-snapshot.h \ + src/dbus-device.c \ src/dbus-device.h \ + src/dbus-execute.c \ src/dbus-execute.h \ + src/dbus-path.c \ src/dbus-path.h \ + src/cgroup.c \ src/cgroup.h \ + src/mount-setup.c \ src/mount-setup.h \ + src/hostname-setup.c \ src/hostname-setup.h \ + src/selinux-setup.c \ src/selinux-setup.h \ + src/ima-setup.c \ + src/ima-setup.h \ src/loopback-setup.h \ + src/loopback-setup.c \ + src/kmod-setup.c \ src/kmod-setup.h \ src/locale-setup.h \ + src/locale-setup.c \ + src/machine-id-setup.c \ src/machine-id-setup.h \ - src/specifier.h \ - src/unit-name.h \ + src/fdset.c \ src/fdset.h \ - src/namespace.h \ - src/tcpwrap.h \ + src/cgroup-util.c \ src/cgroup-util.h \ + src/condition.c \ src/condition.h \ + src/dbus-common.c \ src/dbus-common.h \ + src/install.c \ src/install.h \ + src/specifier.c \ + src/specifier.h \ + src/namespace.c \ + src/namespace.h \ + src/unit-name.c \ + src/unit-name.h \ + src/tcpwrap.c \ + 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 \ src/def.h \ src/ioprio.h \ @@ -640,12 +679,34 @@ EXTRA_DIST += \ src/polkit.h \ src/dbus-loop.h \ src/spawn-agent.h \ - src/acl-util.h \ - src/logs-show.h \ - src/utf8.h \ - src/journal/sparse-endian.h \ - src/ima-setup.h + src/logs-show.h +nodist_libsystemd_core_la_SOURCES = \ + src/load-fragment-gperf.c \ + src/load-fragment-gperf-nulstr.c + +EXTRA_DIST += \ + src/load-fragment-gperf.gperf.m4 + +libsystemd_core_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(LIBWRAP_CFLAGS) \ + $(PAM_CFLAGS) \ + $(AUDIT_CFLAGS) \ + $(KMOD_CFLAGS) + +libsystemd_core_la_LIBADD = \ + libsystemd-basic.la \ + libudev.la \ + $(DBUS_LIBS) \ + $(LIBWRAP_LIBS) \ + $(PAM_LIBS) \ + $(AUDIT_LIBS) \ + $(CAP_LIBS) \ + $(KMOD_LIBS) + +# ------------------------------------------------------------------------------ MANPAGES = \ man/systemd.1 \ man/systemctl.1 \ @@ -667,6 +728,7 @@ MANPAGES = \ man/systemd.snapshot.5 \ man/systemd.exec.5 \ man/systemd.special.7 \ + man/systemd.journal-fields.7 \ man/daemon.7 \ man/runlevel.8 \ man/telinit.8 \ @@ -687,7 +749,10 @@ MANPAGES = \ man/systemd-cat.1 \ man/systemd-machine-id-setup.1 \ man/journald.conf.5 \ - man/journalctl.1 + man/journalctl.1 \ + man/udev.7 \ + man/udevadm.8 \ + man/udevd.8 MANPAGES_ALIAS = \ man/reboot.8 \ @@ -716,17 +781,18 @@ EXTRA_DIST += \ $(MANPAGES) \ $(MANPAGES_ALIAS) +# ------------------------------------------------------------------------------ systemd_SOURCES = \ src/main.c systemd_CFLAGS = \ $(AM_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(UDEV_CFLAGS) + $(DBUS_CFLAGS) systemd_LDADD = \ libsystemd-core.la +# ------------------------------------------------------------------------------ test_engine_SOURCES = \ src/test-engine.c @@ -799,6 +865,15 @@ test_install_CFLAGS = \ 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 @@ -812,6 +887,7 @@ systemd_initctl_LDADD = \ libsystemd-daemon.la \ $(DBUS_LIBS) +# ------------------------------------------------------------------------------ systemd_update_utmp_SOURCES = \ src/update-utmp.c \ src/dbus-common.c \ @@ -827,6 +903,7 @@ systemd_update_utmp_LDADD = \ $(DBUS_LIBS) \ $(AUDIT_LIBS) +# ------------------------------------------------------------------------------ systemd_shutdownd_SOURCES = \ src/utmp-wtmp.c \ src/shutdownd.c @@ -841,16 +918,15 @@ systemd_shutdownd_LDADD = \ systemd_shutdown_SOURCES = \ src/mount-setup.c \ src/umount.c \ - src/shutdown.c - -systemd_shutdown_CFLAGS = \ - $(AM_CFLAGS) \ - $(UDEV_CFLAGS) + src/shutdown.c \ + src/watchdog.c \ + src/watchdog.h systemd_shutdown_LDADD = \ libsystemd-basic.la \ - $(UDEV_LIBS) + libudev.la +# ------------------------------------------------------------------------------ systemd_modules_load_SOURCES = \ src/modules-load.c @@ -861,12 +937,14 @@ systemd_modules_load_LDADD = \ 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 \ @@ -875,49 +953,50 @@ systemd_machine_id_setup_SOURCES = \ 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 systemd_fsck_CFLAGS = \ $(AM_CFLAGS) \ - $(UDEV_CFLAGS) \ $(DBUS_CFLAGS) systemd_fsck_LDADD = \ libsystemd-basic.la \ - $(UDEV_LIBS) \ + libudev.la \ $(DBUS_LIBS) +# ------------------------------------------------------------------------------ systemd_timestamp_SOURCES = \ src/timestamp.c systemd_timestamp_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_ac_power_SOURCES = \ src/ac-power.c -systemd_ac_power_CFLAGS = \ - $(AM_CFLAGS) \ - $(UDEV_CFLAGS) - systemd_ac_power_LDADD = \ libsystemd-basic.la \ - $(UDEV_LIBS) + 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 @@ -925,20 +1004,22 @@ systemd_getty_generator_SOURCES = \ 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 @@ -951,6 +1032,7 @@ systemd_cgroups_agent_LDADD = \ libsystemd-basic.la \ $(DBUS_LIBS) +# ------------------------------------------------------------------------------ systemctl_SOURCES = \ src/systemctl.c \ src/utmp-wtmp.c \ @@ -958,7 +1040,6 @@ systemctl_SOURCES = \ 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 \ @@ -976,6 +1057,7 @@ systemctl_LDADD = \ libsystemd-id128.la \ $(DBUS_LIBS) +# ------------------------------------------------------------------------------ systemd_notify_SOURCES = \ src/notify.c \ src/readahead/sd-readahead.c @@ -984,6 +1066,7 @@ systemd_notify_LDADD = \ libsystemd-basic.la \ libsystemd-daemon.la +# ------------------------------------------------------------------------------ systemd_ask_password_SOURCES = \ src/ask-password.c \ src/ask-password-api.c @@ -991,12 +1074,14 @@ systemd_ask_password_SOURCES = \ 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 \ @@ -1006,6 +1091,7 @@ systemd_cgls_SOURCES = \ systemd_cgls_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_cgtop_SOURCES = \ src/cgtop.c \ src/cgroup-util.c @@ -1013,6 +1099,7 @@ systemd_cgtop_SOURCES = \ systemd_cgtop_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_nspawn_SOURCES = \ src/nspawn.c \ src/cgroup-util.c \ @@ -1020,14 +1107,17 @@ systemd_nspawn_SOURCES = \ 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 \ @@ -1102,6 +1192,636 @@ EXTRA_DIST += \ src/libsystemd-daemon.pc.in \ src/libsystemd-daemon.sym +# ------------------------------------------------------------------------------ +SUBDIRS += \ + src/udev/docs + +include_HEADERS += \ + src/udev/libudev.h + +lib_LTLIBRARIES += \ + libudev.la + +noinst_LTLIBRARIES += \ + libudev-private.la + +libudev_la_SOURCES =\ + src/udev/libudev-private.h \ + src/udev/libudev.c \ + src/udev/libudev-list.c \ + src/udev/libudev-util.c \ + src/udev/libudev-device.c \ + src/udev/libudev-enumerate.c \ + src/udev/libudev-monitor.c \ + src/udev/libudev-queue.c + +libudev_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) + +libudev_private_la_SOURCES =\ + $(libudev_la_SOURCES) \ + src/udev/libudev-util-private.c \ + src/udev/libudev-device-private.c \ + src/udev/libudev-queue-private.c + +if HAVE_SELINUX +libudev_private_la_SOURCES +=\ + src/udev/libudev-selinux-private.c +endif + +libudev_private_la_LIBADD = \ + $(SELINUX_LIBS) + +pkgconfiglib_DATA += \ + src/udev/libudev.pc + +EXTRA_DIST += \ + src/udev/libudev.pc.in + +CLEANFILES += \ + src/udev/libudev.pc + +# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed +libudev-install-move-hook: + if test "$(libdir)" != "$(rootlibdir)"; then \ + mkdir -p $(DESTDIR)$(rootlibdir) && \ + so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) && \ + so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \ + ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \ + mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlibdir); \ + fi + +libudev-uninstall-move-hook: + rm -f $(DESTDIR)$(rootlibdir)/libudev.so* + +INSTALL_EXEC_HOOKS += libudev-install-move-hook +UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook + +# ------------------------------------------------------------------------------ +udev-confdirs: + -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d + -mkdir -p $(DESTDIR)$(libexecdir)/udev/devices + +INSTALL_DATA_HOOKS += udev-confdirs + +dist_udevrules_DATA += \ + rules/99-systemd.rules \ + rules/42-usb-hid-pm.rules \ + rules/50-udev-default.rules \ + rules/60-persistent-storage-tape.rules \ + rules/60-persistent-serial.rules \ + rules/60-persistent-input.rules \ + rules/60-persistent-alsa.rules \ + rules/60-persistent-storage.rules \ + rules/75-net-description.rules \ + rules/75-tty-description.rules \ + rules/78-sound-card.rules \ + rules/80-drivers.rules \ + rules/95-udev-late.rules + +udevconfdir = $(sysconfdir)/udev +dist_udevconf_DATA = \ + src/udev/udev.conf + +sharepkgconfigdir = $(datadir)/pkgconfig +sharepkgconfig_DATA = \ + src/udev/udev.pc + +EXTRA_DIST += \ + rules/99-systemd.rules.in \ + src/udev/udev.pc.in + +CLEANFILES += \ + rules/99-systemd.rules \ + src/udev/udev.pc + +EXTRA_DIST += \ + units/udev.service.in \ + units/udev-trigger.service.in \ + units/udev-settle.service.in + +CLEANFILES += \ + units/udev.service \ + units/udev-trigger.service \ + units/udev-settle.service + +systemd-install-hook: + mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants + ln -sf ../udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/udev-control.socket + ln -sf ../udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/udev-kernel.socket + mkdir -p $(DESTDIR)$(systemunitdir)/basic.target.wants + ln -sf ../udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/udev.service + ln -sf ../udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/udev-trigger.service + +INSTALL_DATA_HOOKS += systemd-install-hook + +bin_PROGRAMS += \ + udevadm + +udevlibexec_PROGRAMS = \ + udevd + +udev_common_sources = \ + src/udev/udev.h \ + src/udev/udev-event.c \ + src/udev/udev-watch.c \ + src/udev/udev-node.c \ + src/udev/udev-rules.c \ + src/udev/udev-ctrl.c \ + src/udev/udev-builtin.c \ + src/udev/udev-builtin-blkid.c \ + src/udev/udev-builtin-firmware.c \ + src/udev/udev-builtin-hwdb.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/systemd/sd-daemon.h \ + src/sd-daemon.c + +udev_common_CFLAGS = \ + $(BLKID_CFLAGS) \ + $(KMOD_CFLAGS) + +udev_common_LDADD = \ + libudev-private.la \ + $(BLKID_LIBS) \ + $(KMOD_LIBS) + +udev_common_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -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 + +udev_common_LDADD += \ + libsystemd-login.la \ + libsystemd-acl.la +endif + +udevd_SOURCES = \ + $(udev_common_sources) \ + src/udev/udevd.c + +udevd_CFLAGS = \ + $(udev_common_CFLAGS) + +udevd_LDADD = \ + $(udev_common_LDADD) \ + libsystemd-basic.la + +udevd_CPPFLAGS = \ + $(udev_common_CPPFLAGS) + +udevadm_SOURCES = \ + $(udev_common_sources) \ + src/udev/udevadm.c \ + src/udev/udevadm-info.c \ + src/udev/udevadm-control.c \ + src/udev/udevadm-monitor.c \ + src/udev/udevadm-settle.c \ + src/udev/udevadm-trigger.c \ + src/udev/udevadm-test.c \ + src/udev/udevadm-test-builtin.c + +udevadm_CFLAGS = \ + $(udev_common_CFLAGS) + +udevadm_LDADD = \ + $(udev_common_LDADD) \ + libsystemd-basic.la + +udevadm_CPPFLAGS = \ + $(udev_common_CPPFLAGS) + +# ------------------------------------------------------------------------------ +TESTS = \ + src/udev/test/udev-test.pl \ + src/udev/test/rules-test.sh + +check_PROGRAMS = \ + test-libudev \ + test-udev + +test_libudev_SOURCES = \ + src/udev/test-libudev.c + +test_libudev_LDADD = \ + libudev.la + +test_udev_SOURCES = \ + $(udev_common_sources) \ + src/udev/test-udev.c + +test_udev_CFLAGS = \ + $(udev_common_CFLAGS) + +test_udev_LDADD = \ + $(udev_common_LDADD) \ + libsystemd-basic.la + +test_udev_CPPFLAGS = \ + $(udev_common_CPPFLAGS) + +test_udev_DEPENDENCIES = \ + src/udev/test/sys + +# packed sysfs test tree +src/udev/test/sys: + $(AM_V_GEN)mkdir -p src/udev/test && tar -C src/udev/test/ -xJf $(top_srcdir)/src/udev/test/sys.tar.xz + +test-sys-distclean: + -rm -rf src/udev/test/sys +DISTCLEAN_LOCAL_HOOKS += test-sys-distclean + +EXTRA_DIST += \ + src/udev/test/sys.tar.xz \ + $(TESTS) \ + src/udev/test/rule-syntax-check.py + +# ------------------------------------------------------------------------------ +ata_id_SOURCES = \ + src/udev/ata_id/ata_id.c + +ata_id_LDADD = \ + libudev-private.la \ + libsystemd-basic.la + +udevlibexec_PROGRAMS += \ + ata_id + +# ------------------------------------------------------------------------------ +cdrom_id_SOURCES = \ + src/udev/cdrom_id/cdrom_id.c + +cdrom_id_LDADD = \ + libudev-private.la \ + libsystemd-basic.la + +udevlibexec_PROGRAMS += \ + cdrom_id + +dist_udevrules_DATA += \ + src/udev/cdrom_id/60-cdrom_id.rules + +# ------------------------------------------------------------------------------ +collect_SOURCES = \ + src/udev/collect/collect.c + +collect_LDADD = \ + libudev-private.la + +udevlibexec_PROGRAMS += \ + collect + +# ------------------------------------------------------------------------------ +scsi_id_SOURCES =\ + src/udev/scsi_id/scsi_id.c \ + src/udev/scsi_id/scsi_serial.c \ + src/udev/scsi_id/scsi.h \ + src/udev/scsi_id/scsi_id.h + +scsi_id_LDADD = \ + libudev-private.la \ + libsystemd-basic.la + +udevlibexec_PROGRAMS += \ + scsi_id + +EXTRA_DIST += \ + src/udev/scsi_id/README + +# ------------------------------------------------------------------------------ +v4l_id_SOURCES = \ + src/udev/v4l_id/v4l_id.c + +v4l_id_LDADD = \ + libudev-private.la + +udevlibexec_PROGRAMS += \ + v4l_id + +dist_udevrules_DATA += \ + src/udev/v4l_id/60-persistent-v4l.rules + +# ------------------------------------------------------------------------------ +accelerometer_SOURCES = \ + src/udev/accelerometer/accelerometer.c + +accelerometer_LDADD = \ + libudev-private.la -lm \ + libsystemd-basic.la + +udevlibexec_PROGRAMS += \ + accelerometer + +dist_udevrules_DATA += \ + src/udev/accelerometer/61-accelerometer.rules + +# ------------------------------------------------------------------------------ +if ENABLE_GUDEV +SUBDIRS += \ + src/udev/gudev/docs + +libgudev_includedir = \ + $(includedir)/gudev-1.0/gudev + +libgudev_include_HEADERS = \ + src/udev/gudev/gudev.h \ + src/udev/gudev/gudevenums.h \ + src/udev/gudev/gudevenumtypes.h \ + src/udev/gudev/gudevtypes.h \ + src/udev/gudev/gudevclient.h \ + src/udev/gudev/gudevdevice.h \ + src/udev/gudev/gudevenumerator.h + +lib_LTLIBRARIES += libgudev-1.0.la + +pkgconfiglib_DATA += \ + src/udev/gudev/gudev-1.0.pc + +EXTRA_DIST += \ + src/udev/gudev/gudev-1.0.pc.in + +CLEANFILES += \ + src/udev/gudev/gudev-1.0.pc + +libgudev_1_0_la_SOURCES = \ + src/udev/gudev/gudevenums.h \ + src/udev/gudev/gudevenumtypes.h \ + src/udev/gudev/gudevenumtypes.h\ + src/udev/gudev/gudevtypes.h \ + src/udev/gudev/gudevclient.h \ + src/udev/gudev/gudevclient.c \ + src/udev/gudev/gudevdevice.h \ + src/udev/gudev/gudevdevice.c \ + src/udev/gudev/gudevenumerator.h \ + src/udev/gudev/gudevenumerator.c \ + src/udev/gudev/gudevprivate.h + +nodist_libgudev_1_0_la_SOURCES = \ + src/udev/gudev/gudevmarshal.h \ + src/udev/gudev/gudevmarshal.c \ + src/udev/gudev/gudevenumtypes.h \ + src/udev/gudev/gudevenumtypes.c + +BUILT_SOURCES += \ + $(nodist_libgudev_1_0_la_SOURCES) + +libgudev_1_0_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I$(top_builddir)/src\ + -I$(top_srcdir)/src\ + -I$(top_builddir)/src/udev/gudev \ + -I$(top_srcdir)/src/udev/gudev \ + -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ + -D_GUDEV_COMPILATION \ + -DG_LOG_DOMAIN=\"GUdev\" + +libgudev_1_0_la_CFLAGS = \ + -fvisibility=default \ + $(GLIB_CFLAGS) + +libgudev_1_0_la_LIBADD = \ + libudev.la \ + $(GLIB_LIBS) + +libgudev_1_0_la_LDFLAGS = \ + -version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \ + -export-dynamic -no-undefined \ + -export-symbols-regex '^g_udev_.*' + +EXTRA_DIST += \ + src/udev/gudev/gudevmarshal.list \ + src/udev/gudev/gudevenumtypes.h.template \ + src/udev/gudev/gudevenumtypes.c.template \ + src/udev/gudev/gjs-example.js \ + src/udev/gudev/seed-example-enum.js \ + src/udev/gudev/seed-example.js + +CLEANFILES += \ + $(nodist_libgudev_1_0_la_SOURCES) + +src/udev/gudev/gudevmarshal.h: src/udev/gudev/gudevmarshal.list + $(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@ + +src/udev/gudev/gudevmarshal.c: src/udev/gudev/gudevmarshal.list + $(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \ + glib-genmarshal $< --prefix=g_udev_marshal --body >> $@ + +src/udev/gudev/gudevenumtypes.h: src/udev/gudev/gudevenumtypes.h.template src/udev/gudev/gudevenums.h + $(AM_V_GEN)glib-mkenums --template $^ > \ + $@.tmp && mv $@.tmp $@ + +src/udev/gudev/gudevenumtypes.c: src/udev/gudev/gudevenumtypes.c.template src/udev/gudev/gudevenums.h + $(AM_V_GEN)glib-mkenums --template $^ > \ + $@.tmp && mv $@.tmp $@ + +if ENABLE_INTROSPECTION +src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la $(G_IR_SCANNER) + $(AM_V_GEN)$(G_IR_SCANNER) -v \ + --warn-all \ + --namespace GUdev \ + --nsversion=1.0 \ + --include=GObject-2.0 \ + --library=gudev-1.0 \ + --library-path=$(top_builddir)/src/udev \ + --library-path=$(top_builddir)/src/udev/gudev \ + --output $@ \ + --pkg=glib-2.0 \ + --pkg=gobject-2.0 \ + --pkg-export=gudev-1.0 \ + --c-include=gudev/gudev.h \ + -I$(top_srcdir)/src/udev \ + -I$(top_builddir)/src/udev \ + -D_GUDEV_COMPILATION \ + -D_GUDEV_WORK_AROUND_DEV_T_BUG \ + $(top_srcdir)/src/udev/gudev/gudev.h \ + $(top_srcdir)/src/udev/gudev/gudevtypes.h \ + $(top_srcdir)/src/udev/gudev/gudevenums.h \ + $(or $(wildcard $(top_builddir)/src/udev/gudev/gudevenumtypes.h),$(top_srcdir)/src/udev/gudev/gudevenumtypes.h) \ + $(top_srcdir)/src/udev/gudev/gudevclient.h \ + $(top_srcdir)/src/udev/gudev/gudevdevice.h \ + $(top_srcdir)/src/udev/gudev/gudevenumerator.h \ + $(top_srcdir)/src/udev/gudev/gudevclient.c \ + $(top_srcdir)/src/udev/gudev/gudevdevice.c \ + $(top_srcdir)/src/udev/gudev/gudevenumerator.c + +src/udev/gudev/GUdev-1.0.typelib: src/udev/gudev/GUdev-1.0.gir $(G_IR_COMPILER) + $(AM_V_GEN)g-ir-compiler $< -o $@ + +girdir = $(GIRDIR) +gir_DATA = \ + src/udev/gudev/GUdev-1.0.gir + +typelibsdir = $(GIRTYPELIBDIR) +typelibs_DATA = \ + src/udev/gudev/GUdev-1.0.typelib + +CLEANFILES += $(gir_DATA) $(typelibs_DATA) +endif # ENABLE_INTROSPECTION + +# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed +libgudev-install-move-hook: + if test "$(libdir)" != "$(rootlibdir)"; then \ + mkdir -p $(DESTDIR)$(rootlibdir) && \ + so_img_name=$$(readlink $(DESTDIR)$(libdir)/libgudev-1.0.so) && \ + so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \ + ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libgudev-1.0.so && \ + mv $(DESTDIR)$(libdir)/libgudev-1.0.so.* $(DESTDIR)$(rootlibdir); \ + fi + +libgudev-uninstall-move-hook: + rm -f $(DESTDIR)$(rootlibdir)/libgudev-1.0.so* + +INSTALL_EXEC_HOOKS += libgudev-install-move-hook +UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook +endif + +# ------------------------------------------------------------------------------ +if ENABLE_KEYMAP +keymap_SOURCES = \ + src/udev/keymap/keymap.c + +keymap_CPPFLAGS = \ + $(AM_CPPFLAGS) -I src/udev/keymap + +nodist_keymap_SOURCES = \ + src/udev/keymap/keys-from-name.h \ + src/udev/keymap/keys-to-name.h + +BUILT_SOURCES += \ + $(nodist_keymap_SOURCES) + +udevlibexec_PROGRAMS += \ + keymap + +dist_doc_DATA += \ + src/udev/keymap/README.keymap.txt + +dist_udevrules_DATA += \ + src/udev/keymap/95-keymap.rules \ + src/udev/keymap/95-keyboard-force-release.rules + +dist_udevhome_SCRIPTS = \ + src/udev/keymap/findkeyboards \ + src/udev/keymap/keyboard-force-release.sh + +EXTRA_DIST += \ + src/udev/keymap/check-keymaps.sh + +CLEANFILES += \ + $(nodist_keymap_SOURCES) \ + src/udev/keymap/keys.txt \ + src/udev/keymap/keys-from-name.gperf + +udevkeymapdir = $(libexecdir)/udev/keymaps +dist_udevkeymap_DATA = \ + src/udev/keymap/keymaps/acer \ + src/udev/keymap/keymaps/acer-aspire_5720 \ + src/udev/keymap/keymaps/acer-aspire_8930 \ + src/udev/keymap/keymaps/acer-aspire_5920g \ + src/udev/keymap/keymaps/acer-aspire_6920 \ + src/udev/keymap/keymaps/acer-travelmate_c300 \ + src/udev/keymap/keymaps/asus \ + src/udev/keymap/keymaps/compaq-e_evo \ + src/udev/keymap/keymaps/dell \ + src/udev/keymap/keymaps/dell-latitude-xt2 \ + src/udev/keymap/keymaps/everex-xt5000 \ + src/udev/keymap/keymaps/fujitsu-amilo_li_2732 \ + src/udev/keymap/keymaps/fujitsu-amilo_pa_2548 \ + src/udev/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \ + src/udev/keymap/keymaps/fujitsu-amilo_pro_v3205 \ + src/udev/keymap/keymaps/fujitsu-amilo_si_1520 \ + src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v5 \ + src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v6 \ + src/udev/keymap/keymaps/genius-slimstar-320 \ + src/udev/keymap/keymaps/hewlett-packard \ + src/udev/keymap/keymaps/hewlett-packard-2510p_2530p \ + src/udev/keymap/keymaps/hewlett-packard-compaq_elitebook \ + src/udev/keymap/keymaps/hewlett-packard-pavilion \ + src/udev/keymap/keymaps/hewlett-packard-presario-2100 \ + src/udev/keymap/keymaps/hewlett-packard-tablet \ + src/udev/keymap/keymaps/hewlett-packard-tx2 \ + src/udev/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ + src/udev/keymap/keymaps/inventec-symphony_6.0_7.0 \ + src/udev/keymap/keymaps/lenovo-3000 \ + src/udev/keymap/keymaps/lenovo-ideapad \ + src/udev/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ + src/udev/keymap/keymaps/lenovo-thinkpad_x6_tablet \ + src/udev/keymap/keymaps/lenovo-thinkpad_x200_tablet \ + src/udev/keymap/keymaps/lg-x110 \ + src/udev/keymap/keymaps/logitech-wave \ + src/udev/keymap/keymaps/logitech-wave-cordless \ + src/udev/keymap/keymaps/logitech-wave-pro-cordless \ + src/udev/keymap/keymaps/maxdata-pro_7000 \ + src/udev/keymap/keymaps/medion-fid2060 \ + src/udev/keymap/keymaps/medionnb-a555 \ + src/udev/keymap/keymaps/micro-star \ + src/udev/keymap/keymaps/module-asus-w3j \ + src/udev/keymap/keymaps/module-ibm \ + src/udev/keymap/keymaps/module-lenovo \ + src/udev/keymap/keymaps/module-sony \ + src/udev/keymap/keymaps/module-sony-old \ + src/udev/keymap/keymaps/module-sony-vgn \ + src/udev/keymap/keymaps/olpc-xo \ + src/udev/keymap/keymaps/onkyo \ + src/udev/keymap/keymaps/oqo-model2 \ + src/udev/keymap/keymaps/samsung-other \ + src/udev/keymap/keymaps/samsung-90x3a \ + src/udev/keymap/keymaps/samsung-sq1us \ + src/udev/keymap/keymaps/samsung-sx20s \ + src/udev/keymap/keymaps/toshiba-satellite_a100 \ + src/udev/keymap/keymaps/toshiba-satellite_a110 \ + src/udev/keymap/keymaps/toshiba-satellite_m30x \ + src/udev/keymap/keymaps/zepto-znote + +udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release +dist_udevkeymapforcerel_DATA = \ + src/udev/keymap/force-release-maps/dell-touchpad \ + src/udev/keymap/force-release-maps/hp-other \ + src/udev/keymap/force-release-maps/samsung-other \ + src/udev/keymap/force-release-maps/samsung-90x3a \ + src/udev/keymap/force-release-maps/common-volume-keys + +src/udev/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h + $(AM_V_at)mkdir -p src/keymap + $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ + +src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@ + +src/udev/keymap/keys-from-name.h: src/udev/keymap/keys-from-name.gperf Makefile + $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@ + +src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt Makefile + $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@ + +keymaps-distcheck-hook: src/udev/keymap/keys.txt + $(top_srcdir)/src/udev/keymap/check-keymaps.sh $(top_srcdir) $^ +DISTCHECK_HOOKS += keymaps-distcheck-hook +endif + +# ------------------------------------------------------------------------------ +mtd_probe_SOURCES = \ + src/udev/mtd_probe/mtd_probe.c \ + src/udev/mtd_probe/mtd_probe.h \ + src/udev/mtd_probe/probe_smartmedia.c + +mtd_probe_CPPFLAGS = \ + $(AM_CPPFLAGS) + +dist_udevrules_DATA += \ + src/udev/mtd_probe/75-probe_mtd.rules + +udevlibexec_PROGRAMS += \ + mtd_probe + # ------------------------------------------------------------------------------ libsystemd_id128_la_SOURCES = \ src/sd-id128.c @@ -1167,32 +1887,33 @@ systemd_journald_SOURCES = \ src/journal/journal-file.c \ src/journal/lookup3.c \ src/journal/journal-rate-limit.c \ + src/journal/sparse-endian.h \ src/sd-id128.c \ src/cgroup-util.c -if HAVE_ACL -systemd_journald_SOURCES += \ - src/acl-util.c -endif - nodist_systemd_journald_SOURCES = \ src/journal/journald-gperf.c -systemd_journald_CFLAGS = \ - $(AM_CFLAGS) \ - $(ACL_CFLAGS) +systemd_journald_CFLAGS = systemd_journald_LDADD = \ libsystemd-basic.la \ + libsystemd-audit.la \ libsystemd-daemon.la \ - libsystemd-login.la \ - $(ACL_LIBS) + libsystemd-login.la + +if HAVE_ACL +systemd_journald_LDADD += \ + libsystemd-acl.la +endif if HAVE_XZ systemd_journald_SOURCES += \ src/journal/compress.c + systemd_journald_CFLAGS += \ $(XZ_CFLAGS) + systemd_journald_LDADD += \ $(XZ_LIBS) endif @@ -1247,6 +1968,13 @@ test_journal_LDADD += \ $(XZ_LIBS) endif +test_journal_send_SOURCES = \ + src/journal/test-journal-send.c + +test_journal_send_LDADD = \ + libsystemd-basic.la \ + libsystemd-journal.la + libsystemd_journal_la_SOURCES = \ src/journal/sd-journal.c \ src/journal/journal-file.c \ @@ -1297,7 +2025,8 @@ UNINSTALL_EXEC_HOOKS += \ libsystemd-journal-uninstall-hook noinst_PROGRAMS += \ - test-journal + test-journal \ + test-journal-send pkginclude_HEADERS += \ src/systemd/sd-journal.h \ @@ -1459,24 +2188,16 @@ systemd_readahead_collect_SOURCES = \ systemd_readahead_collect_LDADD = \ libsystemd-basic.la \ libsystemd-daemon.la \ - $(UDEV_LIBS) - -systemd_readahead_collect_CFLAGS = \ - $(AM_CFLAGS) \ - $(UDEV_CFLAGS) + libudev.la systemd_readahead_replay_SOURCES = \ src/readahead/readahead-replay.c \ src/readahead/readahead-common.c -systemd_readahead_replay_CFLAGS = \ - $(AM_CFLAGS) \ - $(UDEV_CFLAGS) - systemd_readahead_replay_LDADD = \ libsystemd-basic.la \ libsystemd-daemon.la \ - $(UDEV_LIBS) + libudev.la rootlibexec_PROGRAMS += \ systemd-readahead-collect \ @@ -1571,12 +2292,11 @@ systemd_cryptsetup_SOURCES = \ systemd_cryptsetup_CFLAGS = \ $(AM_CFLAGS) \ - $(LIBCRYPTSETUP_CFLAGS) \ - $(UDEV_CFLAGS) + $(LIBCRYPTSETUP_CFLAGS) systemd_cryptsetup_LDADD = \ $(LIBCRYPTSETUP_LIBS) \ - $(UDEV_LIBS) \ + libudev.la \ libsystemd-basic.la systemd_cryptsetup_generator_SOURCES = \ @@ -1780,24 +2500,24 @@ systemd_logind_SOURCES = \ nodist_systemd_logind_SOURCES = \ src/login/logind-gperf.c -if HAVE_ACL -systemd_logind_SOURCES += \ - src/login/logind-acl.c \ - src/acl-util.c -endif - systemd_logind_CFLAGS = \ $(AM_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(UDEV_CFLAGS) \ - $(ACL_CFLAGS) + $(DBUS_CFLAGS) systemd_logind_LDADD = \ libsystemd-basic.la \ + libsystemd-audit.la \ libsystemd-daemon.la \ - $(DBUS_LIBS) \ - $(UDEV_LIBS) \ - $(ACL_LIBS) + libudev.la \ + $(DBUS_LIBS) + +if HAVE_ACL +systemd_logind_SOURCES += \ + src/login/logind-acl.c + +systemd_logind_LDADD += \ + libsystemd-acl.la +endif systemd_user_sessions_SOURCES = \ src/login/user-sessions.c \ @@ -1820,13 +2540,12 @@ loginctl_SOURCES = \ loginctl_CFLAGS = \ $(AM_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(UDEV_CFLAGS) + $(DBUS_CFLAGS) loginctl_LDADD = \ libsystemd-basic.la \ - $(DBUS_LIBS) \ - $(UDEV_LIBS) + libudev.la \ + $(DBUS_LIBS) rootbin_PROGRAMS += \ loginctl @@ -1947,41 +2666,13 @@ INSTALL_DATA_HOOKS += \ systemd_multi_seat_x_SOURCES = \ src/login/multi-seat-x.c -systemd_multi_seat_x_CFLAGS = \ - $(AM_CFLAGS) \ - $(UDEV_CFLAGS) - systemd_multi_seat_x_LDADD = \ libsystemd-basic.la \ - $(UDEV_LIBS) + libudev.la 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) \ - $(UDEV_CFLAGS) \ - $(ACL_CFLAGS) - -systemd_uaccess_LDADD = \ - libsystemd-basic.la \ - libsystemd-daemon.la \ - libsystemd-login.la \ - $(UDEV_LIBS) \ - $(ACL_LIBS) - -rootlibexec_PROGRAMS += \ - systemd-uaccess - dist_udevrules_DATA += \ src/login/70-uaccess.rules @@ -2080,6 +2771,9 @@ SED_PROCESS = \ -e 's,@exec_prefix\@,$(exec_prefix),g' \ -e 's,@libdir\@,$(libdir),g' \ -e 's,@includedir\@,$(includedir),g' \ + -e 's,@VERSION\@,$(VERSION),g' \ + -e 's,@rootprefix\@,$(rootprefix),g' \ + -e 's,@udevlibexecdir\@,$(libexecdir)/udev,g' \ < $< > $@ || rm $@ units/%: units/%.in Makefile @@ -2097,8 +2791,12 @@ sysctl.d/%: sysctl.d/%.in Makefile src/%.policy.in: src/%.policy.in.in Makefile $(SED_PROCESS) -src/%.rules: src/%.rules.in Makefile +%.rules: %.rules.in Makefile + $(SED_PROCESS) + +%.sh: %.sh.in Makefile $(SED_PROCESS) + $(AM_V_GEN)chmod +x $@ src/%.c: src/%.gperf $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ @@ -2135,8 +2833,7 @@ CLEANFILES += \ $(nodist_polkitpolicy_DATA) \ src/load-fragment-gperf.gperf \ src/load-fragment-gperf.c \ - src/load-fragment-gperf-nulstr.c \ - src/99-systemd.rules + src/load-fragment-gperf-nulstr.c if HAVE_XSLTPROC XSLTPROC_FLAGS = \ @@ -2416,15 +3113,19 @@ uninstall-hook: $(UNINSTALL_EXEC_HOOKS) install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS) +distcheck-hook: $(DISTCHECK_HOOKS) + +distclean-local: $(DISTCLEAN_LOCAL_HOOKS) + DISTCHECK_CONFIGURE_FLAGS = \ --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \ --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \ --with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \ --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \ - --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ - --with-rootprefix=$$dc_install_base \ - --disable-split-usr + --with-rootprefix=$$dc_install_base \ + --disable-split-usr \ + --enable-gtk-doc upload: all distcheck cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/