X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=4a12d89b5e25681294e3ddc7281245d414533d4a;hp=fc8b20c2b46b9f913ff076282d6873f67505c0c0;hb=6af684ee5cf49f3d0fef16369c3c2782c8a73357;hpb=79d4c0a2e19b225cccad633d69e540bb694241ed diff --git a/Makefile.am b/Makefile.am index fc8b20c2b..4a12d89b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,27 +1,36 @@ # 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 -# the Free Software Foundation; either version 2 of the License, or +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or # (at your option) any later version. # # systemd is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. +# Lesser General Public License for more details. # -# You should have received a copy of the GNU General Public License +# You should have received a copy of the GNU Lesser 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=0 +LIBSYSTEMD_LOGIN_REVISION=1 LIBSYSTEMD_LOGIN_AGE=2 LIBSYSTEMD_DAEMON_CURRENT=0 @@ -29,11 +38,11 @@ LIBSYSTEMD_DAEMON_REVISION=1 LIBSYSTEMD_DAEMON_AGE=0 LIBSYSTEMD_ID128_CURRENT=0 -LIBSYSTEMD_ID128_REVISION=2 +LIBSYSTEMD_ID128_REVISION=3 LIBSYSTEMD_ID128_AGE=0 LIBSYSTEMD_JOURNAL_CURRENT=0 -LIBSYSTEMD_JOURNAL_REVISION=2 +LIBSYSTEMD_JOURNAL_REVISION=3 LIBSYSTEMD_JOURNAL_AGE=0 # Dirs of external packages @@ -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,39 @@ 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 = +noinst_LTLIBRARIES = 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,13 +118,22 @@ 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"\" \ + -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \ -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/core \ + -I $(top_srcdir)/src/udev +AM_CFLAGS = $(WARNINGFLAGS) +AM_LDFLAGS = $(GCLDFLAGS) + +# ------------------------------------------------------------------------------ if TARGET_GENTOO AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ @@ -160,6 +188,7 @@ endif endif endif +# ------------------------------------------------------------------------------ rootbin_PROGRAMS = \ systemctl \ systemd-notify \ @@ -177,12 +206,6 @@ bin_PROGRAMS = \ dist_bin_SCRIPTS = \ src/systemd-analyze -if HAVE_GTK -bin_PROGRAMS += \ - systemadm \ - systemd-gnome-ask-password-agent -endif - rootlibexec_PROGRAMS = \ systemd \ systemd-cgroups-agent \ @@ -212,7 +235,8 @@ noinst_PROGRAMS = \ test-cgroup \ test-env-replace \ test-strv \ - test-install + test-install \ + test-watchdog dist_pkgsysconf_DATA = \ src/system.conf \ @@ -224,9 +248,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 \ @@ -271,6 +292,7 @@ dist_systemunit_DATA = \ units/remote-fs-pre.target \ units/network.target \ units/nss-lookup.target \ + units/nss-user-lookup.target \ units/mail-transfer-agent.target \ units/http-daemon.target \ units/poweroff.target \ @@ -291,10 +313,8 @@ dist_systemunit_DATA = \ units/dev-mqueue.mount \ units/sys-kernel-config.mount \ units/sys-kernel-debug.mount \ - units/sys-kernel-security.mount \ units/sys-fs-fuse-connections.mount \ - units/var-run.mount \ - units/media.mount \ + units/tmp.mount \ units/remount-rootfs.service \ units/printer.target \ units/sound.target \ @@ -304,12 +324,9 @@ dist_systemunit_DATA = \ units/quotaon.service \ units/systemd-ask-password-wall.path \ units/systemd-ask-password-console.path \ - units/syslog.target - -if HAVE_SYSV_COMPAT -dist_systemunit_DATA += \ - units/var-lock.mount -endif + units/syslog.target \ + units/udev-control.socket \ + units/udev-kernel.socket nodist_systemunit_DATA = \ units/getty@.service \ @@ -327,13 +344,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 \ @@ -345,8 +366,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 \ @@ -358,6 +379,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 \ @@ -366,9 +388,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 @@ -432,8 +456,10 @@ endif dist_doc_DATA = \ README \ - NEWS \ - LICENSE \ + NEWS \ + LICENSE.LGPL2.1 \ + LICENSE.GPL2 \ + LICENSE.MIT \ DISTRO_PORTING pkgconfigdata_DATA = \ @@ -453,208 +479,10 @@ EXTRA_DIST += \ @INTLTOOL_POLICY_RULE@ -noinst_LTLIBRARIES = \ - libsystemd-basic.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 - -libsystemd_basic_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(SELINUX_CFLAGS) - -libsystemd_basic_la_LIBADD = \ - $(SELINUX_LIBS) \ - $(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/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 - -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) \ - $(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) - -# 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. - -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 \ - src/unit.h \ - src/job.h \ - src/manager.h \ - src/path-lookup.h \ - src/load-fragment.h \ - src/service.h \ - src/automount.h \ - src/mount.h \ - src/swap.h \ - src/device.h \ - src/target.h \ - src/snapshot.h \ - src/socket.h \ - src/timer.h \ - src/path.h \ - src/load-dropin.h \ - src/execute.h \ - src/utmp-wtmp.h \ - src/dbus.h \ - src/dbus-manager.h \ - src/dbus-unit.h \ - src/dbus-job.h \ - src/dbus-service.h \ - src/dbus-socket.h \ - src/dbus-timer.h \ - src/dbus-target.h \ - src/dbus-mount.h \ - src/dbus-automount.h \ - src/dbus-swap.h \ - src/dbus-snapshot.h \ - src/dbus-device.h \ - src/dbus-execute.h \ - src/dbus-path.h \ - src/cgroup.h \ - src/mount-setup.h \ - src/hostname-setup.h \ - src/selinux-setup.h \ - src/loopback-setup.h \ - src/kmod-setup.h \ - src/locale-setup.h \ - src/machine-id-setup.h \ - src/specifier.h \ - src/unit-name.h \ - src/fdset.h \ - src/namespace.h \ - src/tcpwrap.h \ - src/cgroup-util.h \ - src/condition.h \ - src/dbus-common.h \ - src/install.h \ - src/cgroup-attr.h \ - src/macro.h \ - src/def.h \ - src/ioprio.h \ - src/missing.h \ - src/list.h \ - src/securebits.h \ - src/linux/auto_dev-ioctl.h \ - src/linux/fanotify.h \ - src/initreq.h \ - src/special.h \ - src/dbus-common.h \ - src/bus-errors.h \ - src/cgroup-show.h \ - src/build.h \ - src/shutdownd.h \ - src/umount.h \ - src/ask-password-api.h \ - src/pager.h \ - src/sysfs-show.h \ - src/polkit.h \ - src/dbus-loop.h \ - src/spawn-agent.h \ - src/acl-util.h \ - src/logs-show.h - +# ------------------------------------------------------------------------------ MANPAGES = \ man/systemd.1 \ man/systemctl.1 \ - man/systemadm.1 \ man/systemd-cgls.1 \ man/systemd-cgtop.1 \ man/systemd-nspawn.1 \ @@ -673,6 +501,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 \ @@ -689,7 +518,11 @@ MANPAGES = \ man/machine-info.5 \ man/modules-load.d.5 \ man/sysctl.d.5 \ - man/systemd-ask-password.1 + man/systemd-ask-password.1 \ + man/systemd-cat.1 \ + man/systemd-machine-id-setup.1 \ + man/journald.conf.5 \ + man/journalctl.1 MANPAGES_ALIAS = \ man/reboot.8 \ @@ -700,121 +533,398 @@ man/reboot.8: man/halt.8 man/poweroff.8: man/halt.8 man/init.1: man/systemd.1 +XML_FILES = \ + ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} + if ENABLE_MANPAGES -dist_man_MANS = \ +man_MANS = \ $(MANPAGES) \ $(MANPAGES_ALIAS) -XML_FILES = \ - ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} - -dist_noinst_DATA = \ +noinst_DATA = \ ${XML_FILES:.xml=.html} +endif EXTRA_DIST += \ - $(XML_FILES) + $(XML_FILES) \ + ${XML_FILES:.xml=.html} \ + $(MANPAGES) \ + $(MANPAGES_ALIAS) + +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libsystemd-shared.la + +libsystemd_shared_la_SOURCES = \ + src/shared/util.c \ + src/shared/util.h \ + src/shared/virt.c \ + src/shared/virt.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/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 \ + src/shared/pager.c \ + src/shared/pager.h \ + src/shared/ioprio.h \ + src/shared/socket-util.c \ + src/shared/socket-util.h \ + src/shared/cgroup-util.c \ + src/shared/cgroup-util.h \ + src/shared/dbus-common.c \ + src/shared/dbus-common.h \ + src/shared/hostname-setup.c \ + src/shared/hostname-setup.h \ + src/shared/logs-show.c \ + src/shared/logs-show.h \ + src/shared/cgroup-show.c \ + src/shared/cgroup-show.h \ + src/shared/unit-name.c \ + src/shared/unit-name.h \ + src/shared/utmp-wtmp.c \ + src/shared/utmp-wtmp.h \ + src/shared/watchdog.c \ + src/shared/watchdog.h \ + src/shared/umount.c \ + src/shared/umount.h \ + src/shared/spawn-ask-password-agent.c \ + src/shared/spawn-ask-password-agent.h \ + src/shared/mount-setup.c \ + src/shared/mount-setup.h \ + src/shared/machine-id-util.c \ + src/shared/machine-id-util.h \ + src/shared/loopback-setup.h \ + src/shared/loopback-setup.c \ + src/shared/specifier.c \ + src/shared/specifier.h \ + src/shared/spawn-polkit-agent.c \ + src/shared/spawn-polkit-agent.h \ + src/shared/list.h \ + src/shared/macro.h + +libsystemd_shared_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libsystemd-label.la + +libsystemd_label_la_SOURCES = \ + src/shared/install.c \ + src/shared/install.h \ + src/shared/path-lookup.c \ + src/shared/path-lookup.h \ + src/shared/cgroup-label.c \ + src/shared/socket-label.c \ + src/shared/label.c \ + src/shared/label.h \ + src/shared/mkdir.c \ + src/shared/mkdir.h + +libsystemd_label_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(SELINUX_CFLAGS) + +libsystemd_label_la_LIBADD = \ + $(SELINUX_LIBS) + +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libsystemd-capability.la + +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) + +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libsystemd-audit.la + +libsystemd_audit_la_SOURCES = \ + src/shared/audit.c \ + src/shared/audit.h + +libsystemd_audit_la_LIBADD = \ + libsystemd-capability.la + +# ------------------------------------------------------------------------------ +if HAVE_ACL +noinst_LTLIBRARIES += \ + libsystemd-acl.la + +libsystemd_acl_la_SOURCES = \ + src/shared/acl-util.c \ + src/shared/acl-util.h + +libsystemd_acl_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(ACL_CFLAGS) + +libsystemd_acl_la_LIBADD = \ + $(ACL_LIBS) endif +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libsystemd-core.la + +libsystemd_core_la_SOURCES = \ + src/def.h \ + src/missing.h \ + src/linux/auto_dev-ioctl.h \ + src/linux/fanotify.h \ + src/core/unit.c \ + src/core/unit.h \ + src/core/job.c \ + src/core/job.h \ + src/core/manager.c \ + src/core/manager.h \ + src/core/load-fragment.c \ + src/core/load-fragment.h \ + src/core/service.c \ + src/core/service.h \ + src/core/automount.c \ + src/core/automount.h \ + src/core/mount.c \ + src/core/mount.h \ + src/core/swap.c \ + src/core/swap.h \ + src/core/device.c \ + src/core/device.h \ + src/core/target.c \ + src/core/target.h \ + src/core/snapshot.c \ + src/core/snapshot.h \ + src/core/socket.c \ + src/core/socket.h \ + src/core/timer.c \ + src/core/timer.h \ + src/core/path.c \ + src/core/path.h \ + src/core/load-dropin.c \ + src/core/load-dropin.h \ + src/core/execute.c \ + src/core/execute.h \ + src/core/dbus.c \ + src/core/dbus.h \ + src/core/dbus-manager.c \ + src/core/dbus-manager.h \ + src/core/dbus-unit.c \ + src/core/dbus-unit.h \ + src/core/dbus-job.c \ + src/core/dbus-job.h \ + src/core/dbus-service.c \ + src/core/dbus-service.h \ + src/core/dbus-socket.c \ + src/core/dbus-socket.h \ + src/core/dbus-timer.c \ + src/core/dbus-timer.h \ + src/core/dbus-target.c \ + src/core/dbus-target.h \ + src/core/dbus-mount.c \ + src/core/dbus-mount.h \ + src/core/dbus-automount.c \ + src/core/dbus-automount.h \ + src/core/dbus-swap.c \ + src/core/dbus-swap.h \ + src/core/dbus-snapshot.c \ + src/core/dbus-snapshot.h \ + src/core/dbus-device.c \ + src/core/dbus-device.h \ + src/core/dbus-execute.c \ + src/core/dbus-execute.h \ + src/core/dbus-path.c \ + src/core/dbus-path.h \ + src/core/cgroup.c \ + src/core/cgroup.h \ + src/core/selinux-setup.c \ + src/core/selinux-setup.h \ + src/core/ima-setup.c \ + src/core/ima-setup.h \ + src/core/kmod-setup.c \ + src/core/kmod-setup.h \ + src/core/locale-setup.h \ + src/core/locale-setup.c \ + src/core/fdset.c \ + src/core/fdset.h \ + src/core/condition.c \ + src/core/condition.h \ + src/core/namespace.c \ + src/core/namespace.h \ + src/core/tcpwrap.c \ + src/core/tcpwrap.h \ + src/core/cgroup-attr.c \ + src/core/cgroup-attr.h \ + src/core/securebits.h \ + src/core/initreq.h \ + src/core/special.h \ + src/core/bus-errors.h \ + src/core/build.h \ + src/core/ask-password-api.h \ + src/core/sysfs-show.h \ + src/core/polkit.h \ + src/core/dbus-loop.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-capability.la \ + libsystemd-label.la \ + libsystemd-shared.la \ + libudev.la \ + $(DBUS_LIBS) \ + $(LIBWRAP_LIBS) \ + $(PAM_LIBS) \ + $(AUDIT_LIBS) \ + $(CAP_LIBS) \ + $(KMOD_LIBS) + +# ------------------------------------------------------------------------------ systemd_SOURCES = \ - src/main.c + src/core/main.c systemd_CFLAGS = \ $(AM_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(UDEV_CFLAGS) + $(DBUS_CFLAGS) systemd_LDADD = \ - libsystemd-core.la + libsystemd-core.la \ + libsystemd-daemon.la \ + libsystemd-id128.la +# ------------------------------------------------------------------------------ test_engine_SOURCES = \ - src/test-engine.c + test/test-engine.c -test_engine_CFLAGS = $(systemd_CFLAGS) -test_engine_LDADD = $(systemd_LDADD) +test_engine_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +test_engine_LDADD = \ + libsystemd-core.la \ + libsystemd-daemon.la test_job_type_SOURCES = \ - src/test-job-type.c + test/test-job-type.c -test_job_type_CFLAGS = $(systemd_CFLAGS) -test_job_type_LDADD = $(systemd_LDADD) +test_job_type_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +test_job_type_LDADD = \ + libsystemd-core.la test_ns_SOURCES = \ - src/test-ns.c + test/test-ns.c -test_ns_CFLAGS = $(systemd_CFLAGS) -test_ns_LDADD = $(systemd_LDADD) +test_ns_LDADD = \ + libsystemd-core.la test_loopback_SOURCES = \ - src/test-loopback.c \ - src/loopback-setup.c + test/test-loopback.c test_loopback_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la test_hostname_SOURCES = \ - src/test-hostname.c \ - src/hostname-setup.c + test/test-hostname.c test_hostname_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la test_daemon_SOURCES = \ - src/test-daemon.c + test/test-daemon.c test_daemon_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-daemon.la test_cgroup_SOURCES = \ - src/test-cgroup.c \ - src/cgroup-util.c + test/test-cgroup.c test_cgroup_LDADD = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la test_env_replace_SOURCES = \ - src/test-env-replace.c + test/test-env-replace.c test_env_replace_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la test_strv_SOURCES = \ - src/test-strv.c \ - src/specifier.c + test/test-strv.c test_strv_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la test_install_SOURCES = \ - src/test-install.c \ - src/install.c \ - src/path-lookup.c \ - src/unit-name.c + test/test-install.c test_install_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) test_install_LDADD = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la + +test_watchdog_SOURCES = \ + test/test-watchdog.c +test_watchdog_LDADD = \ + libsystemd-shared.la + +# ------------------------------------------------------------------------------ systemd_initctl_SOURCES = \ - src/initctl.c \ - src/dbus-common.c + src/initctl.c systemd_initctl_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) systemd_initctl_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-daemon.la \ $(DBUS_LIBS) +# ------------------------------------------------------------------------------ systemd_update_utmp_SOURCES = \ - src/update-utmp.c \ - src/dbus-common.c \ - src/utmp-wtmp.c + src/update-utmp.c systemd_update_utmp_CFLAGS = \ $(AM_CFLAGS) \ @@ -822,264 +932,217 @@ systemd_update_utmp_CFLAGS = \ $(AUDIT_CFLAGS) systemd_update_utmp_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ $(DBUS_LIBS) \ $(AUDIT_LIBS) +# ------------------------------------------------------------------------------ systemd_shutdownd_SOURCES = \ - src/utmp-wtmp.c \ src/shutdownd.c -systemd_shutdownd_CFLAGS = \ - $(AM_CFLAGS) - systemd_shutdownd_LDADD = \ - libsystemd-basic.la \ + libsystemd-label.la \ + libsystemd-shared.la \ libsystemd-daemon.la +pkginclude_HEADERS += \ + src/systemd/sd-shutdown.h + +# ------------------------------------------------------------------------------ systemd_shutdown_SOURCES = \ - src/mount-setup.c \ - src/umount.c \ src/shutdown.c -systemd_shutdown_CFLAGS = \ - $(AM_CFLAGS) \ - $(UDEV_CFLAGS) - systemd_shutdown_LDADD = \ - libsystemd-basic.la \ - $(UDEV_LIBS) + libsystemd-label.la \ + libsystemd-shared.la \ + libudev.la +# ------------------------------------------------------------------------------ systemd_modules_load_SOURCES = \ src/modules-load.c systemd_modules_load_CFLAGS = \ + $(AM_CFLAGS) \ $(KMOD_CFLAGS) systemd_modules_load_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ $(KMOD_LIBS) +# ------------------------------------------------------------------------------ systemd_tmpfiles_SOURCES = \ src/tmpfiles.c systemd_tmpfiles_LDADD = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la +# ------------------------------------------------------------------------------ systemd_machine_id_setup_SOURCES = \ - src/machine-id-setup.c \ - src/machine-id-main.c \ - src/sd-id128.c + src/machine-id-setup.c systemd_machine_id_setup_LDADD = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la \ + libsystemd-id128.la +# ------------------------------------------------------------------------------ systemd_sysctl_SOURCES = \ src/sysctl.c systemd_sysctl_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la +# ------------------------------------------------------------------------------ systemd_fsck_SOURCES = \ - src/fsck.c \ - src/dbus-common.c + src/fsck.c systemd_fsck_CFLAGS = \ $(AM_CFLAGS) \ - $(UDEV_CFLAGS) \ $(DBUS_CFLAGS) systemd_fsck_LDADD = \ - libsystemd-basic.la \ - $(UDEV_LIBS) \ + libsystemd-shared.la \ + libudev.la \ $(DBUS_LIBS) +# ------------------------------------------------------------------------------ systemd_timestamp_SOURCES = \ src/timestamp.c systemd_timestamp_LDADD = \ - libsystemd-basic.la + libsystemd-shared.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) + libsystemd-shared.la \ + libudev.la +# ------------------------------------------------------------------------------ systemd_detect_virt_SOURCES = \ src/detect-virt.c systemd_detect_virt_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la +# ------------------------------------------------------------------------------ systemd_getty_generator_SOURCES = \ - src/getty-generator.c \ - src/unit-name.c + src/getty-generator.c systemd_getty_generator_LDADD = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la +# ------------------------------------------------------------------------------ systemd_rc_local_generator_SOURCES = \ src/rc-local-generator.c systemd_rc_local_generator_LDADD = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la +# ------------------------------------------------------------------------------ systemd_remount_api_vfs_SOURCES = \ - src/remount-api-vfs.c \ - src/mount-setup.c \ - src/exit-status.c + src/remount-api-vfs.c systemd_remount_api_vfs_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la +# ------------------------------------------------------------------------------ systemd_cgroups_agent_SOURCES = \ - src/cgroups-agent.c \ - src/dbus-common.c + src/cgroups-agent.c systemd_cgroups_agent_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) systemd_cgroups_agent_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ $(DBUS_LIBS) +# ------------------------------------------------------------------------------ systemctl_SOURCES = \ - src/systemctl.c \ - src/utmp-wtmp.c \ - src/dbus-common.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 \ - src/spawn-agent.c \ - src/logs-show.c + src/systemctl.c systemctl_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) systemctl_LDADD = \ - libsystemd-basic.la \ + libsystemd-label.la \ + libsystemd-shared.la \ libsystemd-daemon.la \ libsystemd-journal.la \ libsystemd-id128.la \ $(DBUS_LIBS) +# ------------------------------------------------------------------------------ systemd_notify_SOURCES = \ src/notify.c \ src/readahead/sd-readahead.c systemd_notify_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-daemon.la +# ------------------------------------------------------------------------------ systemd_ask_password_SOURCES = \ src/ask-password.c \ src/ask-password-api.c systemd_ask_password_LDADD = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la +# ------------------------------------------------------------------------------ systemd_reply_password_SOURCES = \ src/reply-password.c systemd_reply_password_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la +# ------------------------------------------------------------------------------ systemd_cgls_SOURCES = \ - src/cgls.c \ - src/cgroup-show.c \ - src/cgroup-util.c \ - src/pager.c + src/cgls.c systemd_cgls_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la +# ------------------------------------------------------------------------------ systemd_cgtop_SOURCES = \ - src/cgtop.c \ - src/cgroup-util.c + src/cgtop.c systemd_cgtop_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la +# ------------------------------------------------------------------------------ systemd_nspawn_SOURCES = \ - src/nspawn.c \ - src/cgroup-util.c \ - src/loopback-setup.c + src/nspawn.c systemd_nspawn_LDADD = \ - libsystemd-basic.la \ + libsystemd-label.la \ + libsystemd-capability.la \ + libsystemd-shared.la \ libsystemd-daemon.la +# ------------------------------------------------------------------------------ systemd_stdio_bridge_SOURCES = \ src/bridge.c systemd_stdio_bridge_LDADD = \ - libsystemd-basic.la - -systemadm_SOURCES = \ - src/systemadm.vala \ - src/systemd-interfaces.vala \ - src/wraplabel.vala - -systemadm_CFLAGS = \ - $(AM_CFLAGS) \ - $(GTK_CFLAGS) \ - -Wno-unused-variable \ - -Wno-unused-function \ - -Wno-shadow \ - -Wno-format-nonliteral - -systemadm_VALAFLAGS = \ - --pkg=posix \ - --pkg=gtk+-2.0 \ - --pkg=gee-1.0 \ - -g - -systemadm_LDADD = \ - $(GTK_LIBS) - -systemd_gnome_ask_password_agent_SOURCES = \ - src/gnome-ask-password-agent.vala - -systemd_gnome_ask_password_agent_CFLAGS = \ - $(AM_CFLAGS) \ - $(LIBNOTIFY_CFLAGS) \ - $(GTK_CFLAGS) \ - -Wno-unused-variable \ - -Wno-unused-function \ - -Wno-shadow \ - -Wno-format-nonliteral - -systemd_gnome_ask_password_agent_VALAFLAGS = \ - --pkg=posix \ - --pkg=gtk+-2.0 \ - --pkg=linux \ - --pkg=gio-unix-2.0 \ - --pkg=libnotify \ - -g - -systemd_gnome_ask_password_agent_LDADD = \ - $(LIBNOTIFY_LIBS) \ - $(GTK_LIBS) + libsystemd-shared.la +# ------------------------------------------------------------------------------ systemd_tty_ask_password_agent_SOURCES = \ src/tty-ask-password-agent.c \ - src/ask-password-api.c \ - src/utmp-wtmp.c + src/ask-password-api.c systemd_tty_ask_password_agent_LDADD = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la # ------------------------------------------------------------------------------ libsystemd_daemon_la_SOURCES = \ @@ -1091,6 +1154,7 @@ libsystemd_daemon_la_CFLAGS = \ -DSD_EXPORT_SYMBOLS libsystemd_daemon_la_LDFLAGS = \ + $(AM_LDFLAGS) \ -shared \ -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \ -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym @@ -1147,6 +1211,640 @@ 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 + +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_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=hidden + +libudev_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) + +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 + +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libudev-private.la + +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_CFLAGS = \ + $(AM_CFLAGS) \ + $(SELINUX_CFLAGS) + -fvisibility=default + +libudev_private_la_LIBADD = \ + $(SELINUX_LIBS) + +# ------------------------------------------------------------------------------ +MANPAGES += \ + man/udev.7 \ + man/udevadm.8 \ + man/udevd.8 + +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 + +noinst_LTLIBRARIES += \ + libudev-core.la + +libudev_core_la_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 + +libudev_core_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(BLKID_CFLAGS) \ + $(KMOD_CFLAGS) + +libudev_core_la_LIBADD = \ + libudev-private.la \ + libsystemd-daemon.la \ + libsystemd-shared.la \ + $(BLKID_LIBS) \ + $(KMOD_LIBS) + +libudev_core_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DFIRMWARE_PATH="$(FIRMWARE_PATH)" \ + -DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\" + +if HAVE_ACL +libudev_core_la_SOURCES += \ + src/udev/udev-builtin-uaccess.c \ + src/login/logind-acl.c + +libudev_core_la_LIBADD += \ + libsystemd-login.la \ + libsystemd-acl.la +endif + +udevd_SOURCES = \ + src/udev/udevd.c + +udevd_LDADD = \ + libudev-core.la + +udevadm_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_LDADD = \ + libudev-core.la \ + libsystemd-shared.la + +# ------------------------------------------------------------------------------ +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 = \ + src/udev/test-udev.c + +test_udev_LDADD = \ + libudev-core.la \ + libudev-private.la \ + libsystemd-shared.la + +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-shared.la + +udevlibexec_PROGRAMS += \ + ata_id + +# ------------------------------------------------------------------------------ +cdrom_id_SOURCES = \ + src/udev/cdrom_id/cdrom_id.c + +cdrom_id_LDADD = \ + libudev.la \ + libsystemd-shared.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-shared.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.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.la -lm \ + libsystemd-shared.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 \ + -I$(top_srcdir)/src/udev \ + -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 = \ + $(AM_CFLAGS) \ + -fvisibility=default \ + $(GLIB_CFLAGS) + +libgudev_1_0_la_LIBADD = \ + libudev.la \ + $(GLIB_LIBS) + +libgudev_1_0_la_LDFLAGS = \ + $(AM_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 +-include $(INTROSPECTION_MAKEFILE) + +src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la + +src_udev_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0 + +src_udev_gudev_GUdev_1_0_gir_CFLAGS = \ + $(INCLUDES) \ + -D_GUDEV_COMPILATION \ + -D_GUDEV_WORK_AROUND_DEV_T_BUG \ + -I$(top_srcdir)/src/udev \ + -I$(top_builddir)/src/udev + +src_udev_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la + +src_udev_gudev_GUdev_1_0_gir_SCANNERFLAGS = \ + --pkg-export=gudev-1.0 \ + --warn-all + +src_udev_gudev_GUdev_1_0_gir_FILES = \ + $(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 + +INTROSPECTION_GIRS = src/udev/gudev/GUdev-1.0.gir +INTROSPECTION_SCANNER_ARGS = --c-include=gudev/gudev.h + +girdir = $(datadir)/gir-1.0 +gir_DATA = \ + src/udev/gudev/GUdev-1.0.gir + +typelibsdir = $(libdir)/girepository-1.0 +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/udev/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 @@ -1156,19 +1854,20 @@ libsystemd_id128_la_CFLAGS = \ -fvisibility=hidden libsystemd_id128_la_LDFLAGS = \ + $(AM_LDFLAGS) \ -shared \ -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \ -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym libsystemd_id128_la_LIBADD = \ - libsystemd-basic.la + libsystemd-shared.la test_id128_SOURCES = \ - src/test-id128.c \ - src/sd-id128.c + test/test-id128.c test_id128_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la \ + libsystemd-id128.la noinst_PROGRAMS += \ test-id128 @@ -1208,36 +1907,45 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ systemd_journald_SOURCES = \ src/journal/journald.c \ + src/journal/journald.h \ src/journal/sd-journal.c \ src/journal/journal-file.c \ + src/journal/journal-file.h \ src/journal/lookup3.c \ + src/journal/lookup3.h \ src/journal/journal-rate-limit.c \ - src/sd-id128.c \ - src/cgroup-util.c - -if HAVE_ACL -systemd_journald_SOURCES += \ - src/acl-util.c -endif + src/journal/journal-rate-limit.h \ + src/journal/sparse-endian.h \ + src/journal/journal-def.h \ + src/journal/journal-internal.h \ + src/journal/compress.h 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-label.la \ + libsystemd-shared.la \ + libsystemd-audit.la \ libsystemd-daemon.la \ libsystemd-login.la \ - $(ACL_LIBS) + libsystemd-id128.la + +if HAVE_ACL +systemd_journald_LDADD += \ + libsystemd-acl.la +endif if HAVE_XZ systemd_journald_SOURCES += \ src/journal/compress.c + systemd_journald_CFLAGS += \ + $(AM_CFLAGS) \ $(XZ_CFLAGS) + systemd_journald_LDADD += \ $(XZ_LIBS) endif @@ -1246,26 +1954,24 @@ systemd_cat_SOURCES = \ src/journal/cat.c systemd_cat_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-journal.la -systemd_journalctl_SOURCES = \ - src/journal/journalctl.c \ - src/pager.c \ - src/logs-show.c +journalctl_SOURCES = \ + src/journal/journalctl.c -systemd_journalctl_LDADD = \ - libsystemd-basic.la \ +journalctl_LDADD = \ + libsystemd-shared.la \ libsystemd-journal.la \ libsystemd-id128.la if HAVE_XZ -systemd_journalctl_SOURCES += \ +journalctl_SOURCES += \ src/journal/compress.c -systemd_journalctl_CFLAGS = \ +journalctl_CFLAGS = \ $(AM_CFLAGS) \ $(XZ_CFLAGS) -systemd_journalctl_LDADD += \ +journalctl_LDADD += \ $(XZ_LIBS) endif @@ -1274,11 +1980,12 @@ test_journal_SOURCES = \ src/journal/sd-journal.c \ src/journal/journal-file.c \ src/journal/lookup3.c \ - src/journal/journal-send.c \ - src/sd-id128.c + src/journal/journal-send.c test_journal_LDADD = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la \ + libsystemd-id128.la if HAVE_XZ test_journal_SOURCES += \ @@ -1292,6 +1999,13 @@ test_journal_LDADD += \ $(XZ_LIBS) endif +test_journal_send_SOURCES = \ + src/journal/test-journal-send.c + +test_journal_send_LDADD = \ + libsystemd-shared.la \ + libsystemd-journal.la + libsystemd_journal_la_SOURCES = \ src/journal/sd-journal.c \ src/journal/journal-file.c \ @@ -1303,12 +2017,13 @@ libsystemd_journal_la_CFLAGS = \ -fvisibility=hidden libsystemd_journal_la_LDFLAGS = \ + $(AM_LDFLAGS) \ -shared \ -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \ -Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym libsystemd_journal_la_LIBADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-id128.la if HAVE_XZ @@ -1316,6 +2031,7 @@ libsystemd_journal_la_SOURCES += \ src/journal/compress.c libsystemd_journal_la_CFLAGS += \ + $(AM_CFLAGS) \ $(XZ_CFLAGS) libsystemd_journal_la_LIBADD += \ @@ -1342,7 +2058,8 @@ UNINSTALL_EXEC_HOOKS += \ libsystemd-journal-uninstall-hook noinst_PROGRAMS += \ - test-journal + test-journal \ + test-journal-send pkginclude_HEADERS += \ src/systemd/sd-journal.h \ @@ -1355,7 +2072,7 @@ rootlibexec_PROGRAMS += \ systemd-journald rootbin_PROGRAMS += \ - systemd-journalctl + journalctl bin_PROGRAMS += \ systemd-cat @@ -1367,7 +2084,7 @@ nodist_systemunit_DATA += \ units/systemd-journald.service dist_pkgsysconf_DATA += \ - src/journal/systemd-journald.conf + src/journal/journald.conf pkgconfiglib_DATA += \ src/journal/libsystemd-journal.pc @@ -1387,13 +2104,6 @@ INSTALL_DATA_HOOKS += \ journal-install-data-hook EXTRA_DIST += \ - src/journal/journald.h \ - src/journal/journal-def.h \ - src/journal/journal-internal.h \ - src/journal/journal-file.h \ - src/journal/lookup3.h \ - src/journal/compress.h \ - src/journal/journal-rate-limit.h \ src/journal/libsystemd-journal.pc.in \ src/journal/libsystemd-journal.sym \ units/systemd-journald.service.in \ @@ -1408,9 +2118,10 @@ systemd_coredump_SOURCES = \ src/journal/coredump.c systemd_coredump_LDADD = \ - libsystemd-basic.la \ libsystemd-journal.la \ - libsystemd-login.la + libsystemd-login.la \ + libsystemd-label.la \ + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-coredump @@ -1431,7 +2142,7 @@ systemd_binfmt_SOURCES = \ src/binfmt/binfmt.c systemd_binfmt_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-binfmt @@ -1470,7 +2181,7 @@ systemd_vconsole_setup_SOURCES = \ src/vconsole/vconsole-setup.c systemd_vconsole_setup_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-vconsole-setup @@ -1499,29 +2210,25 @@ endif if ENABLE_READAHEAD systemd_readahead_collect_SOURCES = \ src/readahead/readahead-collect.c \ - src/readahead/readahead-common.c + src/readahead/readahead-common.c \ + src/readahead/readahead-common.h systemd_readahead_collect_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.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-shared.la \ libsystemd-daemon.la \ - $(UDEV_LIBS) + libudev.la + +pkginclude_HEADERS += \ + src/systemd/sd-readahead.h rootlibexec_PROGRAMS += \ systemd-readahead-collect \ @@ -1536,8 +2243,6 @@ nodist_systemunit_DATA += \ units/systemd-readahead-done.service EXTRA_DIST += \ - src/systemd/sd-readahead.h \ - src/readahead/readahead-common.h \ units/systemd-readahead-collect.service.in \ units/systemd-readahead-replay.service.in \ units/systemd-readahead-done.service.in @@ -1562,7 +2267,7 @@ systemd_quotacheck_SOURCES = \ src/quotacheck.c systemd_quotacheck_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la endif # ------------------------------------------------------------------------------ @@ -1582,7 +2287,8 @@ systemd_random_seed_SOURCES = \ src/random-seed.c systemd_random_seed_LDADD = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la randomseed-install-data-hook: $(MKDIR_P) -m 0755 \ @@ -1616,20 +2322,20 @@ systemd_cryptsetup_SOURCES = \ systemd_cryptsetup_CFLAGS = \ $(AM_CFLAGS) \ - $(LIBCRYPTSETUP_CFLAGS) \ - $(UDEV_CFLAGS) + $(LIBCRYPTSETUP_CFLAGS) systemd_cryptsetup_LDADD = \ - $(LIBCRYPTSETUP_LIBS) \ - $(UDEV_LIBS) \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la \ + libudev.la \ + $(LIBCRYPTSETUP_LIBS) systemd_cryptsetup_generator_SOURCES = \ - src/cryptsetup/cryptsetup-generator.c \ - src/unit-name.c + src/cryptsetup/cryptsetup-generator.c systemd_cryptsetup_generator_LDADD = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la cryptsetup-install-data-hook: $(MKDIR_P) -m 0755 \ @@ -1646,7 +2352,6 @@ endif if ENABLE_HOSTNAMED systemd_hostnamed_SOURCES = \ src/hostname/hostnamed.c \ - src/dbus-common.c \ src/polkit.c systemd_hostnamed_CFLAGS = \ @@ -1654,7 +2359,7 @@ systemd_hostnamed_CFLAGS = \ $(DBUS_CFLAGS) systemd_hostnamed_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-daemon.la \ $(DBUS_LIBS) @@ -1697,7 +2402,6 @@ endif if ENABLE_LOCALED systemd_localed_SOURCES = \ src/locale/localed.c \ - src/dbus-common.c \ src/polkit.c systemd_localed_CFLAGS = \ @@ -1705,7 +2409,8 @@ systemd_localed_CFLAGS = \ $(DBUS_CFLAGS) systemd_localed_LDADD = \ - libsystemd-basic.la \ + libsystemd-label.la \ + libsystemd-shared.la \ libsystemd-daemon.la \ $(DBUS_LIBS) @@ -1758,7 +2463,6 @@ endif if ENABLE_TIMEDATED systemd_timedated_SOURCES = \ src/timedate/timedated.c \ - src/dbus-common.c \ src/polkit.c systemd_timedated_CFLAGS = \ @@ -1766,7 +2470,7 @@ systemd_timedated_CFLAGS = \ $(DBUS_CFLAGS) systemd_timedated_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-daemon.la \ $(DBUS_LIBS) @@ -1809,103 +2513,101 @@ endif if ENABLE_LOGIND systemd_logind_SOURCES = \ src/login/logind.c \ + src/login/logind.h \ src/login/logind-dbus.c \ src/login/logind-device.c \ + src/login/logind-device.h \ src/login/logind-seat.c \ - src/login/logind-seat-dbus.c \ + src/login/logind-seat.h \ src/login/logind-session.c \ - src/login/logind-session-dbus.c \ + src/login/logind-session.h \ src/login/logind-user.c \ + src/login/logind-user.h \ + src/login/logind-session-dbus.c \ + src/login/logind-seat-dbus.c \ src/login/logind-user-dbus.c \ - src/dbus-common.c \ src/dbus-loop.c \ - src/cgroup-util.c \ - src/polkit.c + src/polkit.c \ + src/login/logind-acl.h 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-label.la \ + libsystemd-shared.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 \ - src/cgroup-util.c + src/login/user-sessions.c systemd_user_sessions_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-logind \ systemd-user-sessions -systemd_loginctl_SOURCES = \ +loginctl_SOURCES = \ src/login/loginctl.c \ - src/login/sysfs-show.c \ - src/dbus-common.c \ - src/cgroup-show.c \ - src/cgroup-util.c \ - src/pager.c + src/login/sysfs-show.c -systemd_loginctl_CFLAGS = \ +loginctl_CFLAGS = \ $(AM_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(UDEV_CFLAGS) + $(DBUS_CFLAGS) -systemd_loginctl_LDADD = \ - libsystemd-basic.la \ - $(DBUS_LIBS) \ - $(UDEV_LIBS) +loginctl_LDADD = \ + libsystemd-shared.la \ + libudev.la \ + $(DBUS_LIBS) rootbin_PROGRAMS += \ - systemd-loginctl + loginctl test_login_SOURCES = \ src/login/test-login.c test_login_LDADD = \ - libsystemd-basic.la \ - libsystemd-login.la + libsystemd-login.la \ + libsystemd-shared.la noinst_PROGRAMS += \ test-login libsystemd_login_la_SOURCES = \ - src/login/sd-login.c \ - src/cgroup-util.c + src/login/sd-login.c libsystemd_login_la_CFLAGS = \ $(AM_CFLAGS) \ -fvisibility=hidden libsystemd_login_la_LDFLAGS = \ + $(AM_LDFLAGS) \ -shared \ -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \ -Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym libsystemd_login_la_LIBADD = \ - libsystemd-basic.la + libsystemd-shared.la if HAVE_PAM pam_systemd_la_SOURCES = \ - src/login/pam-module.c \ - src/dbus-common.c + src/login/pam-module.c pam_systemd_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1914,6 +2616,7 @@ pam_systemd_la_CFLAGS = \ -fvisibility=hidden pam_systemd_la_LDFLAGS = \ + $(AM_LDFLAGS) \ -module \ -export-dynamic \ -avoid-version \ @@ -1921,8 +2624,9 @@ pam_systemd_la_LDFLAGS = \ -export-symbols-regex '^pam_sm_.*' pam_systemd_la_LIBADD = \ - libsystemd-basic.la \ libsystemd-daemon.la \ + libsystemd-audit.la \ + libsystemd-shared.la \ $(PAM_LIBS) \ $(DBUS_LIBS) @@ -1960,7 +2664,7 @@ dist_dbuspolicy_DATA += \ src/login/org.freedesktop.login1.conf dist_pkgsysconf_DATA += \ - src/login/systemd-logind.conf + src/login/logind.conf pkginclude_HEADERS += \ src/systemd/sd-login.h @@ -1977,7 +2681,7 @@ polkitpolicy_in_files += \ logind-install-data-hook: $(MKDIR_P) -m 0755 \ $(DESTDIR)$(systemunitdir)/multi-user.target.wants \ - $(DESTDIR)$(localstatedir)/lib/systemd + $(DESTDIR)$(localstatedir)/lib/systemd ( cd $(DESTDIR)$(systemunitdir) && \ rm -f dbus-org.freedesktop.login1.service && \ $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service) @@ -1992,54 +2696,25 @@ 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) + libsystemd-label.la \ + libsystemd-shared.la \ + 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 - dist_udevrules_DATA += \ + src/login/70-uaccess.rules \ src/login/71-seat.rules nodist_udevrules_DATA += \ src/login/73-seat-late.rules MANPAGES += \ - man/systemd-logind.conf.5 \ + man/logind.conf.5 \ man/sd-login.7 \ - man/systemd-loginctl.1 \ + man/loginctl.1 \ man/sd_login_monitor_new.3 \ man/sd_pid_get_session.3 \ man/sd_uid_get_state.3 \ @@ -2090,12 +2765,6 @@ EXTRA_DIST += \ src/login/logind-gperf.gperf \ src/login/libsystemd-login.pc.in \ src/login/libsystemd-login.sym \ - src/login/logind.h \ - src/login/logind-device.h \ - src/login/logind-seat.h \ - src/login/logind-session.h \ - src/login/logind-user.h \ - src/login/logind-acl.h \ src/login/73-seat-late.rules.in \ units/systemd-logind.service.in \ units/systemd-user-sessions.service.in @@ -2125,6 +2794,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 @@ -2142,8 +2814,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 $@) && \ @@ -2180,13 +2856,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 - -if HAVE_VALAC -CLEANFILES += \ - ${systemadm_SOURCES:.vala=.c} -endif + src/load-fragment-gperf-nulstr.c if HAVE_XSLTPROC XSLTPROC_FLAGS = \ @@ -2297,13 +2967,11 @@ systemd-install-data-hook: rm -f systemd-remount-api-vfs.service \ fsck-root.service \ remount-rootfs.service \ - var-run.mount \ - media.mount && \ + tmp.mount && \ $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \ $(LN_S) ../fsck-root.service fsck-root.service && \ $(LN_S) ../remount-rootfs.service remount-rootfs.service && \ - $(LN_S) ../var-run.mount var-run.mount && \ - $(LN_S) ../media.mount media.mount ) + $(LN_S) ../tmp.mount tmp.mount ) ( cd $(DESTDIR)$(userunitdir) && \ rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \ $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \ @@ -2340,7 +3008,6 @@ systemd-install-data-hook: dev-mqueue.mount \ sys-kernel-config.mount \ sys-kernel-debug.mount \ - sys-kernel-security.mount \ sys-fs-fuse-connections.mount \ systemd-modules-load.service \ systemd-tmpfiles-setup.service \ @@ -2350,7 +3017,6 @@ systemd-install-data-hook: $(LN_S) ../dev-mqueue.mount dev-mqueue.mount && \ $(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \ $(LN_S) ../sys-kernel-debug.mount sys-kernel-debug.mount && \ - $(LN_S) ../sys-kernel-security.mount sys-kernel-security.mount && \ $(LN_S) ../sys-fs-fuse-connections.mount sys-fs-fuse-connections.mount && \ $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \ $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \ @@ -2464,27 +3130,25 @@ if TARGET_MAGEIA $(LN_S) $(systemunitdir)/display-manager.service display-manager.service ) endif -if HAVE_SYSV_COMPAT - ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \ - rm -f var-lock.mount && \ - $(LN_S) ../var-lock.mount var-lock.mount ) -endif - install-exec-hook: $(INSTALL_EXEC_HOOKS) 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/$(prefix) - + --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/