X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=a2087820e7584bb05b4ffd4a573c2a84617851f8;hp=8f56d2549605e6af6771cb25a13edf0a55161a05;hb=33e48d472e4e8e123be7bce5a0962cab7eaaa508;hpb=2d13da8821b8197e62f819b5b996750800e910ab diff --git a/Makefile.am b/Makefile.am index 8f56d2549..a2087820e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,19 +1,21 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- */ +# # This file is part of systemd. # # 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_FLAGS} @@ -81,9 +83,9 @@ 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 = @@ -91,6 +93,15 @@ polkitpolicy_in_files = dist_udevrules_DATA = nodist_udevrules_DATA = dist_man_MANS = +dist_pkgsysconf_DATA = +dist_dbuspolicy_DATA = +dbusinterface_DATA = +dist_dbussystemservice_DATA = +check_PROGRAMS = +check_DATA = +noinst_PROGRAMS = +TESTS = +udevlibexec_PROGRAMS = AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ @@ -119,16 +130,20 @@ AM_CPPFLAGS = \ -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \ -DX_SERVER=\"$(bindir)/X\" \ -DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \ + -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \ -I $(top_srcdir)/src \ - -I $(top_srcdir)/src/readahead \ + -I $(top_srcdir)/src/shared \ -I $(top_srcdir)/src/login \ -I $(top_srcdir)/src/journal \ -I $(top_srcdir)/src/systemd \ + -I $(top_srcdir)/src/core \ + -I $(top_srcdir)/src/libudev \ -I $(top_srcdir)/src/udev AM_CFLAGS = $(WARNINGFLAGS) AM_LDFLAGS = $(GCLDFLAGS) +# ------------------------------------------------------------------------------ if TARGET_GENTOO AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ @@ -183,6 +198,7 @@ endif endif endif +# ------------------------------------------------------------------------------ rootbin_PROGRAMS = \ systemctl \ systemd-notify \ @@ -195,10 +211,11 @@ bin_PROGRAMS = \ systemd-cgls \ systemd-cgtop \ systemd-stdio-bridge \ - systemd-nspawn + systemd-nspawn \ + systemd-detect-virt dist_bin_SCRIPTS = \ - src/systemd-analyze + src/analyze/systemd-analyze rootlibexec_PROGRAMS = \ systemd \ @@ -213,52 +230,13 @@ rootlibexec_PROGRAMS = \ systemd-fsck \ systemd-timestamp \ systemd-ac-power \ - systemd-detect-virt \ systemd-sysctl systemgenerator_PROGRAMS = \ systemd-getty-generator -noinst_PROGRAMS = \ - test-engine \ - test-job-type \ - test-ns \ - test-loopback \ - test-hostname \ - test-daemon \ - test-cgroup \ - test-env-replace \ - test-strv \ - test-install \ - test-watchdog - -dist_pkgsysconf_DATA = \ - src/system.conf \ - src/user.conf - -dist_dbuspolicy_DATA = \ - src/org.freedesktop.systemd1.conf - -dist_dbussystemservice_DATA = \ - src/org.freedesktop.systemd1.service - -dbusinterface_DATA = \ - org.freedesktop.systemd1.Manager.xml \ - org.freedesktop.systemd1.Job.xml \ - org.freedesktop.systemd1.Unit.xml \ - org.freedesktop.systemd1.Service.xml \ - org.freedesktop.systemd1.Socket.xml \ - org.freedesktop.systemd1.Timer.xml \ - org.freedesktop.systemd1.Target.xml \ - org.freedesktop.systemd1.Device.xml \ - org.freedesktop.systemd1.Mount.xml \ - org.freedesktop.systemd1.Automount.xml \ - org.freedesktop.systemd1.Snapshot.xml \ - org.freedesktop.systemd1.Swap.xml \ - org.freedesktop.systemd1.Path.xml - dist_bashcompletion_DATA = \ - src/systemd-bash-completion.sh + bash-completion/systemd-bash-completion.sh dist_tmpfiles_DATA = \ tmpfiles.d/systemd.conf \ @@ -286,6 +264,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 \ @@ -318,8 +297,8 @@ dist_systemunit_DATA = \ units/systemd-ask-password-wall.path \ units/systemd-ask-password-console.path \ units/syslog.target \ - units/udev-control.socket \ - units/udev-kernel.socket + units/systemd-udev-control.socket \ + units/systemd-udev-kernel.socket nodist_systemunit_DATA = \ units/getty@.service \ @@ -345,9 +324,9 @@ nodist_systemunit_DATA = \ units/fsck-root.service \ units/rescue.service \ units/user@.service \ - units/udev.service \ - units/udev-trigger.service \ - units/udev-settle.service + units/systemd-udev.service \ + units/systemd-udev-trigger.service \ + units/systemd-udev-settle.service dist_userunit_DATA = \ units/user/default.target \ @@ -381,10 +360,9 @@ 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 \ + units/systemd-udev.service \ + units/systemd-udev-trigger.service \ + units/systemd-udev-settle.service \ introspect.awk \ man/custom-html.xsl @@ -450,223 +428,14 @@ endif dist_doc_DATA = \ README \ NEWS \ - LICENSE \ + LICENSE.LGPL2.1 \ + LICENSE.GPL2 \ + LICENSE.MIT \ DISTRO_PORTING -pkgconfigdata_DATA = \ - src/systemd.pc - -# First passed through sed, followed by intltool -polkitpolicy_in_in_files = \ - src/org.freedesktop.systemd1.policy.in.in - -nodist_polkitpolicy_DATA = \ - $(polkitpolicy_in_files:.policy.in=.policy) \ - $(polkitpolicy_in_in_files:.policy.in.in=.policy) - -EXTRA_DIST += \ - $(polkitpolicy_in_files) \ - $(polkitpolicy_in_in_files) - @INTLTOOL_POLICY_RULE@ -noinst_LTLIBRARIES = \ - libsystemd-basic.la \ - libsystemd-core.la - -libsystemd_basic_la_SOURCES = \ - src/util.c \ - src/util.h \ - src/virt.c \ - src/virt.h \ - src/label.c \ - src/label.h \ - src/hashmap.c \ - src/hashmap.h \ - src/set.c \ - src/set.h \ - src/strv.c \ - src/strv.h \ - src/conf-parser.c \ - src/conf-parser.h \ - src/socket-util.c \ - src/socket-util.h \ - src/log.c \ - src/log.h \ - src/ratelimit.h \ - src/ratelimit.c \ - src/exit-status.c \ - src/exit-status.h \ - src/utf8.c \ - src/utf8.h - -libsystemd_basic_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(SELINUX_CFLAGS) - -libsystemd_basic_la_LIBADD = \ - $(SELINUX_LIBS) \ - $(CAP_LIBS) - -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/fdset.c \ - src/fdset.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 \ - 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 - -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 \ @@ -688,7 +457,7 @@ MANPAGES = \ man/systemd.snapshot.5 \ man/systemd.exec.5 \ man/systemd.special.7 \ - man/systemd.journal-fields.7 \ + man/systemd.journal-fields.7 \ man/daemon.7 \ man/runlevel.8 \ man/telinit.8 \ @@ -708,11 +477,9 @@ MANPAGES = \ man/systemd-ask-password.1 \ man/systemd-cat.1 \ man/systemd-machine-id-setup.1 \ + man/systemd-detect-virt.1 \ man/journald.conf.5 \ - man/journalctl.1 \ - man/udev.7 \ - man/udevadm.8 \ - man/udevd.8 + man/journalctl.1 MANPAGES_ALIAS = \ man/reboot.8 \ @@ -741,113 +508,480 @@ EXTRA_DIST += \ $(MANPAGES) \ $(MANPAGES_ALIAS) +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libsystemd-shared.la + +libsystemd_shared_la_SOURCES = \ + src/shared/linux/auto_dev-ioctl.h \ + src/shared/linux/fanotify.h \ + src/shared/missing.h \ + src/shared/list.h \ + src/shared/macro.h \ + src/shared/def.h \ + 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/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/spawn-ask-password-agent.c \ + src/shared/spawn-ask-password-agent.h \ + src/shared/specifier.c \ + src/shared/specifier.h \ + src/shared/spawn-polkit-agent.c \ + src/shared/spawn-polkit-agent.h + +libsystemd_shared_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +#------------------------------------------------------------------------------- +noinst_LTLIBRARIES += \ + libsystemd-dbus.la + +libsystemd_dbus_la_SOURCES = \ + src/shared/dbus-common.c \ + src/shared/dbus-common.h \ + src/shared/dbus-loop.c \ + src/shared/dbus-loop.h \ + src/shared/polkit.c \ + src/shared/polkit.h + +libsystemd_dbus_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +libsystemd_dbus_la_LIBADD = \ + $(DBUS_LIBS) + +# ------------------------------------------------------------------------------ +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 \ + src/shared/ask-password-api.c \ + src/shared/ask-password-api.h \ + src/shared/dev-setup.c \ + src/shared/dev-setup.h + +libsystemd_label_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(SELINUX_CFLAGS) + +libsystemd_label_la_LIBADD = \ + $(SELINUX_LIBS) + +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libsystemd-logs.la + +libsystemd_logs_la_SOURCES = \ + src/shared/logs-show.c \ + src/shared/logs-show.h + +libsystemd_logs_la_CFLAGS = \ + $(AM_CFLAGS) + +libsystemd_logs_la_LIBADD = \ + libsystemd-journal.la \ + libsystemd-id128.la + +# ------------------------------------------------------------------------------ +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/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/transaction.c \ + src/core/transaction.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/hostname-setup.c \ + src/core/hostname-setup.h \ + src/core/machine-id-setup.c \ + src/core/machine-id-setup.h \ + src/core/mount-setup.c \ + src/core/mount-setup.h \ + src/core/loopback-setup.h \ + src/core/loopback-setup.c \ + src/core/fdset.c \ + src/core/fdset.h \ + src/core/condition.c \ + src/core/condition.h \ + src/core/namespace.c \ + 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/sysfs-show.h + +nodist_libsystemd_core_la_SOURCES = \ + src/core/load-fragment-gperf.c \ + src/core/load-fragment-gperf-nulstr.c + +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 \ + libsystemd-dbus.la \ + libudev.la \ + $(LIBWRAP_LIBS) \ + $(PAM_LIBS) \ + $(AUDIT_LIBS) \ + $(CAP_LIBS) \ + $(KMOD_LIBS) + +src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ + $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@ + +EXTRA_DIST += \ + src/core/load-fragment-gperf.gperf.m4 + +CLEANFILES += \ + src/core/load-fragment-gperf.gperf \ + src/core/load-fragment-gperf.c \ + src/core/load-fragment-gperf-nulstr.c + +# ------------------------------------------------------------------------------ systemd_SOURCES = \ - src/main.c + src/core/main.c systemd_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) systemd_LDADD = \ - libsystemd-core.la + libsystemd-core.la \ + libsystemd-daemon.la \ + libsystemd-id128.la \ + libsystemd-dbus.la + +dist_pkgsysconf_DATA += \ + src/core/system.conf \ + src/core/user.conf + +dist_dbuspolicy_DATA += \ + src/core/org.freedesktop.systemd1.conf + +dist_dbussystemservice_DATA += \ + src/core/org.freedesktop.systemd1.service + +dbusinterface_DATA += \ + org.freedesktop.systemd1.Manager.xml \ + org.freedesktop.systemd1.Job.xml \ + org.freedesktop.systemd1.Unit.xml \ + org.freedesktop.systemd1.Service.xml \ + org.freedesktop.systemd1.Socket.xml \ + org.freedesktop.systemd1.Timer.xml \ + org.freedesktop.systemd1.Target.xml \ + org.freedesktop.systemd1.Device.xml \ + org.freedesktop.systemd1.Mount.xml \ + org.freedesktop.systemd1.Automount.xml \ + org.freedesktop.systemd1.Snapshot.xml \ + org.freedesktop.systemd1.Swap.xml \ + org.freedesktop.systemd1.Path.xml + +polkitpolicy_in_in_files = \ + src/core/org.freedesktop.systemd1.policy.in.in + +org.freedesktop.systemd1.%.xml: systemd + $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \ + $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \ + $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp + +pkgconfigdata_DATA = \ + src/core/systemd.pc + +EXTRA_DIST += \ + src/core/systemd.pc.in + +# ------------------------------------------------------------------------------ +noinst_PROGRAMS += \ + test-engine \ + test-job-type \ + test-ns \ + test-loopback \ + test-hostname \ + test-daemon \ + test-cgroup \ + test-env-replace \ + test-strv \ + test-install \ + test-watchdog + +TESTS += \ + test-job-type \ + test-env-replace \ + test-strv test_engine_SOURCES = \ - src/test-engine.c + src/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 \ + libsystemd-dbus.la test_job_type_SOURCES = \ - src/test-job-type.c + src/test/test-job-type.c + +test_job_type_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) -test_job_type_CFLAGS = $(systemd_CFLAGS) -test_job_type_LDADD = $(systemd_LDADD) +test_job_type_LDADD = \ + libsystemd-core.la test_ns_SOURCES = \ - src/test-ns.c + src/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 + src/test/test-loopback.c test_loopback_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la \ + libsystemd-core.la test_hostname_SOURCES = \ - src/test-hostname.c \ - src/hostname-setup.c + src/test/test-hostname.c test_hostname_LDADD = \ - libsystemd-basic.la + libsystemd-core.la test_daemon_SOURCES = \ - src/test-daemon.c + src/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 + src/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 + src/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 + src/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 + src/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 = \ - src/test-watchdog.c \ - src/watchdog.c \ - src/watchdog.h + src/test/test-watchdog.c test_watchdog_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la +# ------------------------------------------------------------------------------ systemd_initctl_SOURCES = \ - src/initctl.c \ - src/dbus-common.c + src/initctl/initctl.c systemd_initctl_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) systemd_initctl_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-daemon.la \ - $(DBUS_LIBS) + libsystemd-dbus.la +# ------------------------------------------------------------------------------ systemd_update_utmp_SOURCES = \ - src/update-utmp.c \ - src/dbus-common.c \ - src/utmp-wtmp.c + src/update-utmp/update-utmp.c systemd_update_utmp_CFLAGS = \ $(AM_CFLAGS) \ @@ -855,215 +989,232 @@ systemd_update_utmp_CFLAGS = \ $(AUDIT_CFLAGS) systemd_update_utmp_LDADD = \ - libsystemd-basic.la \ - $(DBUS_LIBS) \ + libsystemd-shared.la \ + libsystemd-dbus.la \ $(AUDIT_LIBS) +# ------------------------------------------------------------------------------ systemd_shutdownd_SOURCES = \ - src/utmp-wtmp.c \ - src/shutdownd.c - -systemd_shutdownd_CFLAGS = \ - $(AM_CFLAGS) + src/shutdownd/shutdownd.c 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 \ - src/watchdog.c \ - src/watchdog.h + src/core/umount.c \ + src/core/umount.h \ + src/core/shutdown.c \ + src/core/mount-setup.c \ + src/core/mount-setup.h systemd_shutdown_LDADD = \ - libsystemd-basic.la \ + libsystemd-label.la \ + libsystemd-shared.la \ libudev.la +# ------------------------------------------------------------------------------ systemd_modules_load_SOURCES = \ - src/modules-load.c + src/modules-load/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 + src/tmpfiles/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/machine-id-setup-main.c \ + src/core/machine-id-setup.c \ + src/core/machine-id-setup.h systemd_machine_id_setup_LDADD = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la \ + libsystemd-id128.la +# ------------------------------------------------------------------------------ systemd_sysctl_SOURCES = \ - src/sysctl.c + src/sysctl/sysctl.c systemd_sysctl_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la +# ------------------------------------------------------------------------------ systemd_fsck_SOURCES = \ - src/fsck.c \ - src/dbus-common.c + src/fsck/fsck.c systemd_fsck_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) systemd_fsck_LDADD = \ - libsystemd-basic.la \ - libudev.la \ - $(DBUS_LIBS) + libsystemd-shared.la \ + libsystemd-dbus.la \ + libudev.la +# ------------------------------------------------------------------------------ systemd_timestamp_SOURCES = \ - src/timestamp.c + src/timestamp/timestamp.c systemd_timestamp_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la +# ------------------------------------------------------------------------------ systemd_ac_power_SOURCES = \ - src/ac-power.c + src/ac-power/ac-power.c systemd_ac_power_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libudev.la +# ------------------------------------------------------------------------------ systemd_detect_virt_SOURCES = \ - src/detect-virt.c + src/detect-virt/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/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 + src/rc-local-generator/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/remount-api-vfs.c \ + src/core/mount-setup.c \ + src/core/mount-setup.h 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/cgroups-agent.c systemd_cgroups_agent_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) systemd_cgroups_agent_LDADD = \ - libsystemd-basic.la \ - $(DBUS_LIBS) + libsystemd-shared.la \ + libsystemd-dbus.la +# ------------------------------------------------------------------------------ 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/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) + libsystemd-dbus.la \ + libsystemd-logs.la +# ------------------------------------------------------------------------------ systemd_notify_SOURCES = \ - src/notify.c \ + src/notify/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 + src/ask-password/ask-password.c systemd_ask_password_LDADD = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la +# ------------------------------------------------------------------------------ systemd_reply_password_SOURCES = \ - src/reply-password.c + src/reply-password/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/cgls.c systemd_cgls_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la +# ------------------------------------------------------------------------------ systemd_cgtop_SOURCES = \ - src/cgtop.c \ - src/cgroup-util.c + src/cgtop/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/nspawn.c \ + src/core/mount-setup.c \ + src/core/mount-setup.h \ + src/core/loopback-setup.c \ + src/core/loopback-setup.h 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 + src/stdio-bridge/stdio-bridge.c systemd_stdio_bridge_LDADD = \ - libsystemd-basic.la + 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/tty-ask-password-agent/tty-ask-password-agent.c systemd_tty_ask_password_agent_LDADD = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la # ------------------------------------------------------------------------------ libsystemd_daemon_la_SOURCES = \ - src/sd-daemon.c + src/libsystemd-daemon/sd-daemon.c libsystemd_daemon_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1071,9 +1222,10 @@ 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 + -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym pkginclude_HEADERS += \ src/systemd/sd-daemon.h @@ -1101,7 +1253,7 @@ lib_LTLIBRARIES += \ libsystemd-daemon.la pkgconfiglib_DATA += \ - src/libsystemd-daemon.pc + src/libsystemd-daemon/libsystemd-daemon.pc MANPAGES += \ man/sd-daemon.7 \ @@ -1124,58 +1276,50 @@ man/sd_is_mq.3: man/sd_is_fifo.3 man/sd_notifyf.3: man/sd_notify.3 EXTRA_DIST += \ - src/libsystemd-daemon.pc.in \ - src/libsystemd-daemon.sym + src/libsystemd-daemon/libsystemd-daemon.pc.in \ + src/libsystemd-daemon/libsystemd-daemon.sym # ------------------------------------------------------------------------------ +if ENABLE_GTK_DOC SUBDIRS += \ - src/udev/docs + docs/libudev +endif include_HEADERS += \ - src/udev/libudev.h + src/libudev/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 + src/libudev/libudev-private.h \ + src/libudev/libudev.c \ + src/libudev/libudev-list.c \ + src/libudev/libudev-util.c \ + src/libudev/libudev-device.c \ + src/libudev/libudev-enumerate.c \ + src/libudev/libudev-monitor.c \ + src/libudev/libudev-queue.c + +libudev_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=hidden 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) +libudev_la_LIBADD = \ + libsystemd-shared.la pkgconfiglib_DATA += \ - src/udev/libudev.pc + src/libudev/libudev.pc EXTRA_DIST += \ - src/udev/libudev.pc.in + src/libudev/libudev.pc.in CLEANFILES += \ - src/udev/libudev.pc + src/libudev/libudev.pc # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libudev-install-move-hook: @@ -1194,6 +1338,27 @@ 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/libudev/libudev-device-private.c \ + src/libudev/libudev-queue-private.c + +libudev_private_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=default + +libudev_private_la_LIBADD = \ + libsystemd-shared.la + +# ------------------------------------------------------------------------------ +MANPAGES += \ + man/udev.7 \ + man/udevadm.8 \ + man/systemd-udevd.8 + udev-confdirs: -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d -mkdir -p $(DESTDIR)$(libexecdir)/udev/devices @@ -1232,32 +1397,35 @@ CLEANFILES += \ src/udev/udev.pc EXTRA_DIST += \ - units/udev.service.in \ - units/udev-trigger.service.in \ - units/udev-settle.service.in + units/systemd-udev.service.in \ + units/systemd-udev-trigger.service.in \ + units/systemd-udev-settle.service.in CLEANFILES += \ - units/udev.service \ - units/udev-trigger.service \ - units/udev-settle.service + units/systemd-udev.service \ + units/systemd-udev-trigger.service \ + units/systemd-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 + ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket + ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-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 + ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev.service + ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev-trigger.service INSTALL_DATA_HOOKS += systemd-install-hook bin_PROGRAMS += \ udevadm -udevlibexec_PROGRAMS = \ - udevd +rootlibexec_PROGRAMS += \ + systemd-udevd + +noinst_LTLIBRARIES += \ + libudev-core.la -udev_common_sources = \ +libudev_core_la_SOURCES = \ src/udev/udev.h \ src/udev/udev-event.c \ src/udev/udev-watch.c \ @@ -1272,53 +1440,42 @@ udev_common_sources = \ 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 + src/libsystemd-daemon/sd-daemon.c -udev_common_CFLAGS = \ +libudev_core_la_CFLAGS = \ + $(AM_CFLAGS) \ $(BLKID_CFLAGS) \ $(KMOD_CFLAGS) -udev_common_LDADD = \ +libudev_core_la_LIBADD = \ libudev-private.la \ + libsystemd-label.la \ + libsystemd-shared.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) -udev_common_CPPFLAGS = \ +libudev_core_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DFIRMWARE_PATH="$(FIRMWARE_PATH)" \ -DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\" if HAVE_ACL -udev_common_sources += \ +libudev_core_la_SOURCES += \ src/udev/udev-builtin-uaccess.c \ src/login/logind-acl.c \ - src/acl-util.c - -udev_common_CFLAGS += \ - $(ACL_CFLAGS) + src/login/sd-login.c -udev_common_LDADD += \ - libsystemd-login.la \ - $(ACL_LIBS) +libudev_core_la_LIBADD += \ + libsystemd-acl.la endif -udevd_SOURCES = \ - $(udev_common_sources) \ +systemd_udevd_SOURCES = \ src/udev/udevd.c -udevd_CFLAGS = \ - $(udev_common_CFLAGS) - -udevd_LDADD = \ - $(udev_common_LDADD) \ - libsystemd-basic.la - -udevd_CPPFLAGS = \ - $(udev_common_CPPFLAGS) +systemd_udevd_LDADD = \ + libudev-core.la udevadm_SOURCES = \ - $(udev_common_sources) \ src/udev/udevadm.c \ src/udev/udevadm-info.c \ src/udev/udevadm-control.c \ @@ -1328,60 +1485,70 @@ udevadm_SOURCES = \ 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) + libudev-core.la \ + libsystemd-shared.la # ------------------------------------------------------------------------------ -TESTS = \ - src/udev/test/udev-test.pl \ - src/udev/test/rules-test.sh +TESTS += \ + test/udev-test.pl \ + test/rules-test.sh -check_PROGRAMS = \ +noinst_PROGRAMS += \ test-libudev \ test-udev test_libudev_SOURCES = \ - src/udev/test-libudev.c + src/test/test-libudev.c test_libudev_LDADD = \ + libsystemd-label.la \ + libsystemd-shared.la \ libudev.la test_udev_SOURCES = \ - $(udev_common_sources) \ - src/udev/test-udev.c + src/test/test-udev.c \ + $(libudev_core_la_SOURCES) \ + $(libudev_private_la_SOURCES) +# The test-udev program needs everything compiled with relative path +# names for /sys, /dev, /run prefixed, pointing to our test/ directory. test_udev_CFLAGS = \ - $(udev_common_CFLAGS) + -DTEST_PREFIX=\"test\" \ + $(libudev_core_la_CFLAGS) \ + $(libudev_private_la_CFLAGS) + +test_udev_CPPFLAGS =\ + $(libudev_core_la_CPPFLAGS) test_udev_LDADD = \ - $(udev_common_LDADD) \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la \ + $(BLKID_LIBS) \ + $(KMOD_LIBS) \ + $(SELINUX_LIBS) -test_udev_CPPFLAGS = \ - $(udev_common_CPPFLAGS) +if HAVE_ACL +test_udev_LDADD += \ + libsystemd-acl.la +endif -test_udev_DEPENDENCIES = \ - src/udev/test/sys +check_DATA += \ + 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: + $(AM_V_GEN)mkdir -p test && tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz test-sys-distclean: - -rm -rf src/udev/test/sys + -rm -rf test/sys DISTCLEAN_LOCAL_HOOKS += test-sys-distclean EXTRA_DIST += \ - src/udev/test/sys.tar.xz \ - $(TESTS) \ - src/udev/test/rule-syntax-check.py + test/sys.tar.xz \ + test/udev-test.pl \ + test/rules-test.sh \ + test/rule-syntax-check.py # ------------------------------------------------------------------------------ ata_id_SOURCES = \ @@ -1389,7 +1556,7 @@ ata_id_SOURCES = \ ata_id_LDADD = \ libudev-private.la \ - libsystemd-basic.la + libsystemd-shared.la udevlibexec_PROGRAMS += \ ata_id @@ -1399,14 +1566,14 @@ cdrom_id_SOURCES = \ src/udev/cdrom_id/cdrom_id.c cdrom_id_LDADD = \ - libudev-private.la \ - libsystemd-basic.la + libudev.la \ + libsystemd-shared.la udevlibexec_PROGRAMS += \ cdrom_id dist_udevrules_DATA += \ - src/udev/cdrom_id/60-cdrom_id.rules + rules/60-cdrom_id.rules # ------------------------------------------------------------------------------ collect_SOURCES = \ @@ -1427,7 +1594,7 @@ scsi_id_SOURCES =\ scsi_id_LDADD = \ libudev-private.la \ - libsystemd-basic.la + libsystemd-shared.la udevlibexec_PROGRAMS += \ scsi_id @@ -1440,74 +1607,76 @@ v4l_id_SOURCES = \ src/udev/v4l_id/v4l_id.c v4l_id_LDADD = \ - libudev-private.la + libudev.la udevlibexec_PROGRAMS += \ v4l_id dist_udevrules_DATA += \ - src/udev/v4l_id/60-persistent-v4l.rules + rules/60-persistent-v4l.rules # ------------------------------------------------------------------------------ accelerometer_SOURCES = \ src/udev/accelerometer/accelerometer.c accelerometer_LDADD = \ - libudev-private.la -lm \ - libsystemd-basic.la + libudev.la -lm \ + libsystemd-shared.la udevlibexec_PROGRAMS += \ accelerometer dist_udevrules_DATA += \ - src/udev/accelerometer/61-accelerometer.rules + rules/61-accelerometer.rules # ------------------------------------------------------------------------------ if ENABLE_GUDEV +if ENABLE_GTK_DOC SUBDIRS += \ - src/udev/gudev/docs + docs/gudev +endif 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 + src/gudev/gudev.h \ + src/gudev/gudevenums.h \ + src/gudev/gudevenumtypes.h \ + src/gudev/gudevtypes.h \ + src/gudev/gudevclient.h \ + src/gudev/gudevdevice.h \ + src/gudev/gudevenumerator.h lib_LTLIBRARIES += libgudev-1.0.la pkgconfiglib_DATA += \ - src/udev/gudev/gudev-1.0.pc + src/gudev/gudev-1.0.pc EXTRA_DIST += \ - src/udev/gudev/gudev-1.0.pc.in + src/gudev/gudev-1.0.pc.in CLEANFILES += \ - src/udev/gudev/gudev-1.0.pc + src/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 + src/gudev/gudevenums.h \ + src/gudev/gudevenumtypes.h \ + src/gudev/gudevenumtypes.h\ + src/gudev/gudevtypes.h \ + src/gudev/gudevclient.h \ + src/gudev/gudevclient.c \ + src/gudev/gudevdevice.h \ + src/gudev/gudevdevice.c \ + src/gudev/gudevenumerator.h \ + src/gudev/gudevenumerator.c \ + src/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 + src/gudev/gudevmarshal.h \ + src/gudev/gudevmarshal.c \ + src/gudev/gudevenumtypes.h \ + src/gudev/gudevenumtypes.c BUILT_SOURCES += \ $(nodist_libgudev_1_0_la_SOURCES) @@ -1516,13 +1685,14 @@ 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 \ + -I$(top_builddir)/src/gudev \ + -I$(top_srcdir)/src/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) @@ -1531,79 +1701,84 @@ libgudev_1_0_la_LIBADD = \ $(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 + src/gudev/gudevmarshal.list \ + src/gudev/gudevenumtypes.h.template \ + src/gudev/gudevenumtypes.c.template \ + src/gudev/gjs-example.js \ + src/gudev/seed-example-enum.js \ + src/gudev/seed-example.js CLEANFILES += \ $(nodist_libgudev_1_0_la_SOURCES) -src/udev/gudev/gudevmarshal.h: src/udev/gudev/gudevmarshal.list +src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list $(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@ -src/udev/gudev/gudevmarshal.c: src/udev/gudev/gudevmarshal.list +src/gudev/gudevmarshal.c: src/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 +src/gudev/gudevenumtypes.h: src/gudev/gudevenumtypes.h.template src/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 +src/gudev/gudevenumtypes.c: src/gudev/gudevenumtypes.c.template src/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) +if HAVE_INTROSPECTION +-include $(INTROSPECTION_MAKEFILE) + +src/gudev/GUdev-1.0.gir: libgudev-1.0.la + +src_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0 + +src_gudev_GUdev_1_0_gir_CFLAGS = \ + $(INCLUDES) \ + -D_GUDEV_COMPILATION \ + -D_GUDEV_WORK_AROUND_DEV_T_BUG \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ + -I$(top_srcdir)/src/gdev \ + -I$(top_builddir)/src/gdev + +src_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la + +src_gudev_GUdev_1_0_gir_SCANNERFLAGS = \ + --pkg-export=gudev-1.0 \ + --warn-all + +src_gudev_GUdev_1_0_gir_FILES = \ + $(top_srcdir)/src/gudev/gudev.h \ + $(top_srcdir)/src/gudev/gudevtypes.h \ + $(top_srcdir)/src/gudev/gudevenums.h \ + $(or $(wildcard $(top_builddir)/src/gudev/gudevenumtypes.h),$(top_srcdir)/src/gudev/gudevenumtypes.h) \ + $(top_srcdir)/src/gudev/gudevclient.h \ + $(top_srcdir)/src/gudev/gudevdevice.h \ + $(top_srcdir)/src/gudev/gudevenumerator.h \ + $(top_srcdir)/src/gudev/gudevclient.c \ + $(top_srcdir)/src/gudev/gudevdevice.c \ + $(top_srcdir)/src/gudev/gudevenumerator.c + +INTROSPECTION_GIRS = src/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 + src/gudev/GUdev-1.0.gir -typelibsdir = $(GIRTYPELIBDIR) +typelibsdir = $(libdir)/girepository-1.0 typelibs_DATA = \ - src/udev/gudev/GUdev-1.0.typelib + src/gudev/GUdev-1.0.typelib CLEANFILES += $(gir_DATA) $(typelibs_DATA) -endif # ENABLE_INTROSPECTION +endif # HAVE_INTROSPECTION # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libgudev-install-move-hook: @@ -1630,6 +1805,9 @@ keymap_SOURCES = \ keymap_CPPFLAGS = \ $(AM_CPPFLAGS) -I src/udev/keymap +keymap_LDADD = \ + libsystemd-shared.la + nodist_keymap_SOURCES = \ src/udev/keymap/keys-from-name.h \ src/udev/keymap/keys-to-name.h @@ -1651,6 +1829,9 @@ dist_udevhome_SCRIPTS = \ src/udev/keymap/findkeyboards \ src/udev/keymap/keyboard-force-release.sh +TESTS += \ + src/udev/keymap/check-keymaps.sh + EXTRA_DIST += \ src/udev/keymap/check-keymaps.sh @@ -1661,75 +1842,76 @@ CLEANFILES += \ 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 + keymaps/acer \ + keymaps/acer-aspire_5720 \ + keymaps/acer-aspire_8930 \ + keymaps/acer-aspire_5920g \ + keymaps/acer-aspire_6920 \ + keymaps/acer-travelmate_c300 \ + keymaps/asus \ + keymaps/compaq-e_evo \ + keymaps/dell \ + keymaps/dell-latitude-xt2 \ + keymaps/everex-xt5000 \ + keymaps/fujitsu-amilo_li_2732 \ + keymaps/fujitsu-amilo_pa_2548 \ + keymaps/fujitsu-amilo_pro_edition_v3505 \ + keymaps/fujitsu-amilo_pro_v3205 \ + keymaps/fujitsu-amilo_si_1520 \ + keymaps/fujitsu-esprimo_mobile_v5 \ + keymaps/fujitsu-esprimo_mobile_v6 \ + keymaps/genius-slimstar-320 \ + keymaps/hewlett-packard \ + keymaps/hewlett-packard-2510p_2530p \ + keymaps/hewlett-packard-compaq_elitebook \ + keymaps/hewlett-packard-pavilion \ + keymaps/hewlett-packard-presario-2100 \ + keymaps/hewlett-packard-tablet \ + keymaps/hewlett-packard-tx2 \ + keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ + keymaps/inventec-symphony_6.0_7.0 \ + keymaps/lenovo-3000 \ + keymaps/lenovo-ideapad \ + keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ + keymaps/lenovo-thinkpad_x6_tablet \ + keymaps/lenovo-thinkpad_x200_tablet \ + keymaps/lg-x110 \ + keymaps/logitech-wave \ + keymaps/logitech-wave-cordless \ + keymaps/logitech-wave-pro-cordless \ + keymaps/maxdata-pro_7000 \ + keymaps/medion-fid2060 \ + keymaps/medionnb-a555 \ + keymaps/micro-star \ + keymaps/module-asus-w3j \ + keymaps/module-ibm \ + keymaps/module-lenovo \ + keymaps/module-sony \ + keymaps/module-sony-old \ + keymaps/module-sony-vgn \ + keymaps/olpc-xo \ + keymaps/onkyo \ + keymaps/oqo-model2 \ + keymaps/samsung-other \ + keymaps/samsung-90x3a \ + keymaps/samsung-sq1us \ + keymaps/samsung-sx20s \ + keymaps/toshiba-satellite_a100 \ + keymaps/toshiba-satellite_a110 \ + keymaps/toshiba-satellite_m30x \ + 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 + keymaps-force-release/dell-touchpad \ + keymaps-force-release/dell-xps \ + keymaps-force-release/hp-other \ + keymaps-force-release/samsung-other \ + keymaps-force-release/samsung-90x3a \ + keymaps-force-release/common-volume-keys src/udev/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h - $(AM_V_at)mkdir -p src/keymap + $(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 @@ -1740,10 +1922,6 @@ src/udev/keymap/keys-from-name.h: src/udev/keymap/keys-from-name.gperf Makefile 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 # ------------------------------------------------------------------------------ @@ -1756,37 +1934,41 @@ mtd_probe_CPPFLAGS = \ $(AM_CPPFLAGS) dist_udevrules_DATA += \ - src/udev/mtd_probe/75-probe_mtd.rules + rules/75-probe_mtd.rules udevlibexec_PROGRAMS += \ mtd_probe # ------------------------------------------------------------------------------ libsystemd_id128_la_SOURCES = \ - src/sd-id128.c + src/libsystemd-id128/sd-id128.c libsystemd_id128_la_CFLAGS = \ $(AM_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 + -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym libsystemd_id128_la_LIBADD = \ - libsystemd-basic.la + libsystemd-shared.la test_id128_SOURCES = \ - src/test-id128.c \ - src/sd-id128.c + src/test/test-id128.c test_id128_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la \ + libsystemd-id128.la noinst_PROGRAMS += \ test-id128 +TESTS += \ + test-id128 + pkginclude_HEADERS += \ src/systemd/sd-id128.h @@ -1794,7 +1976,7 @@ lib_LTLIBRARIES += \ libsystemd-id128.la pkgconfiglib_DATA += \ - src/libsystemd-id128.pc + src/libsystemd-id128/libsystemd-id128.pc # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libsystemd-id128-install-hook: @@ -1816,43 +1998,51 @@ UNINSTALL_EXEC_HOOKS += \ libsystemd-id128-uninstall-hook EXTRA_DIST += \ - src/libsystemd-id128.pc.in \ - src/libsystemd-id128.sym + src/libsystemd-id128/libsystemd-id128.pc.in \ + src/libsystemd-id128/libsystemd-id128.sym # ------------------------------------------------------------------------------ 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/journal/journal-rate-limit.h \ src/journal/sparse-endian.h \ - src/sd-id128.c \ - src/cgroup-util.c - -if HAVE_ACL -systemd_journald_SOURCES += \ - src/acl-util.c -endif + 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 @@ -1861,39 +2051,29 @@ systemd_cat_SOURCES = \ src/journal/cat.c systemd_cat_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-journal.la journalctl_SOURCES = \ - src/journal/journalctl.c \ - src/pager.c \ - src/logs-show.c + src/journal/journalctl.c journalctl_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-journal.la \ - libsystemd-id128.la - -if HAVE_XZ -journalctl_SOURCES += \ - src/journal/compress.c -journalctl_CFLAGS = \ - $(AM_CFLAGS) \ - $(XZ_CFLAGS) -journalctl_LDADD += \ - $(XZ_LIBS) -endif + libsystemd-id128.la \ + libsystemd-logs.la test_journal_SOURCES = \ src/journal/test-journal.c \ 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 += \ @@ -1911,7 +2091,7 @@ test_journal_send_SOURCES = \ src/journal/test-journal-send.c test_journal_send_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-journal.la libsystemd_journal_la_SOURCES = \ @@ -1925,12 +2105,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 @@ -1938,6 +2119,7 @@ libsystemd_journal_la_SOURCES += \ src/journal/compress.c libsystemd_journal_la_CFLAGS += \ + $(AM_CFLAGS) \ $(XZ_CFLAGS) libsystemd_journal_la_LIBADD += \ @@ -1965,7 +2147,7 @@ UNINSTALL_EXEC_HOOKS += \ noinst_PROGRAMS += \ test-journal \ - test-journal-send + test-journal-send pkginclude_HEADERS += \ src/systemd/sd-journal.h \ @@ -2010,13 +2192,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 \ @@ -2031,9 +2206,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 @@ -2054,7 +2230,7 @@ systemd_binfmt_SOURCES = \ src/binfmt/binfmt.c systemd_binfmt_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-binfmt @@ -2093,7 +2269,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 @@ -2122,10 +2298,11 @@ 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 \ libudev.la @@ -2134,10 +2311,13 @@ systemd_readahead_replay_SOURCES = \ src/readahead/readahead-common.c systemd_readahead_replay_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-daemon.la \ libudev.la +pkginclude_HEADERS += \ + src/systemd/sd-readahead.h + rootlibexec_PROGRAMS += \ systemd-readahead-collect \ systemd-readahead-replay @@ -2151,8 +2331,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 @@ -2174,10 +2352,10 @@ EXTRA_DIST += \ units/quotacheck.service.in systemd_quotacheck_SOURCES = \ - src/quotacheck.c + src/quotacheck/quotacheck.c systemd_quotacheck_LDADD = \ - libsystemd-basic.la + libsystemd-shared.la endif # ------------------------------------------------------------------------------ @@ -2194,10 +2372,11 @@ EXTRA_DIST += \ units/systemd-random-seed-load.service.in systemd_random_seed_SOURCES = \ - src/random-seed.c + src/random-seed/random-seed.c systemd_random_seed_LDADD = \ - libsystemd-basic.la + libsystemd-label.la \ + libsystemd-shared.la randomseed-install-data-hook: $(MKDIR_P) -m 0755 \ @@ -2226,24 +2405,24 @@ dist_systemunit_DATA += \ units/cryptsetup.target systemd_cryptsetup_SOURCES = \ - src/cryptsetup/cryptsetup.c \ - src/ask-password-api.c + src/cryptsetup/cryptsetup.c systemd_cryptsetup_CFLAGS = \ $(AM_CFLAGS) \ $(LIBCRYPTSETUP_CFLAGS) systemd_cryptsetup_LDADD = \ - $(LIBCRYPTSETUP_LIBS) \ + libsystemd-label.la \ + libsystemd-shared.la \ libudev.la \ - libsystemd-basic.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 \ @@ -2259,18 +2438,16 @@ endif # ------------------------------------------------------------------------------ if ENABLE_HOSTNAMED systemd_hostnamed_SOURCES = \ - src/hostname/hostnamed.c \ - src/dbus-common.c \ - src/polkit.c + src/hostname/hostnamed.c systemd_hostnamed_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) systemd_hostnamed_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-daemon.la \ - $(DBUS_LIBS) + libsystemd-dbus.la rootlibexec_PROGRAMS += \ systemd-hostnamed @@ -2310,18 +2487,17 @@ endif # ------------------------------------------------------------------------------ if ENABLE_LOCALED systemd_localed_SOURCES = \ - src/locale/localed.c \ - src/dbus-common.c \ - src/polkit.c + src/locale/localed.c systemd_localed_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) systemd_localed_LDADD = \ - libsystemd-basic.la \ + libsystemd-label.la \ + libsystemd-shared.la \ libsystemd-daemon.la \ - $(DBUS_LIBS) + libsystemd-dbus.la nodist_systemunit_DATA += \ units/systemd-localed.service @@ -2371,18 +2547,16 @@ endif # ------------------------------------------------------------------------------ if ENABLE_TIMEDATED systemd_timedated_SOURCES = \ - src/timedate/timedated.c \ - src/dbus-common.c \ - src/polkit.c + src/timedate/timedated.c systemd_timedated_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) systemd_timedated_LDADD = \ - libsystemd-basic.la \ + libsystemd-shared.la \ libsystemd-daemon.la \ - $(DBUS_LIBS) + libsystemd-dbus.la rootlibexec_PROGRAMS += \ systemd-timedated @@ -2423,46 +2597,51 @@ 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-inhibit.c \ + src/login/logind-inhibit.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/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) \ - $(ACL_CFLAGS) + $(DBUS_CFLAGS) systemd_logind_LDADD = \ - libsystemd-basic.la \ + libsystemd-label.la \ + libsystemd-shared.la \ + libsystemd-audit.la \ libsystemd-daemon.la \ - libudev.la \ - $(DBUS_LIBS) \ - $(ACL_LIBS) + libsystemd-dbus.la \ + libudev.la + +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 \ @@ -2470,20 +2649,16 @@ rootlibexec_PROGRAMS += \ 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 loginctl_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) loginctl_LDADD = \ - libsystemd-basic.la \ - libudev.la \ - $(DBUS_LIBS) + libsystemd-shared.la \ + libsystemd-dbus.la \ + libudev.la rootbin_PROGRAMS += \ loginctl @@ -2492,32 +2667,43 @@ test_login_SOURCES = \ src/login/test-login.c test_login_LDADD = \ - libsystemd-basic.la \ - libsystemd-login.la + libsystemd-login.la \ + libsystemd-shared.la + +test_inhibit_SOURCES = \ + src/login/test-inhibit.c + +test_inhibit_LDADD = \ + libsystemd-shared.la \ + libsystemd-dbus.la + +test_inhibit_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) noinst_PROGRAMS += \ - test-login + test-login \ + test-inhibit 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) \ @@ -2526,6 +2712,7 @@ pam_systemd_la_CFLAGS = \ -fvisibility=hidden pam_systemd_la_LDFLAGS = \ + $(AM_LDFLAGS) \ -module \ -export-dynamic \ -avoid-version \ @@ -2533,10 +2720,11 @@ pam_systemd_la_LDFLAGS = \ -export-symbols-regex '^pam_sm_.*' pam_systemd_la_LIBADD = \ - libsystemd-basic.la \ libsystemd-daemon.la \ - $(PAM_LIBS) \ - $(DBUS_LIBS) + libsystemd-audit.la \ + libsystemd-dbus.la \ + libsystemd-shared.la \ + $(PAM_LIBS) pamlib_LTLIBRARIES = \ pam_systemd.la @@ -2589,7 +2777,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) @@ -2605,16 +2793,15 @@ systemd_multi_seat_x_SOURCES = \ src/login/multi-seat-x.c systemd_multi_seat_x_LDADD = \ - libsystemd-basic.la \ + libsystemd-label.la \ + libsystemd-shared.la \ libudev.la rootlibexec_PROGRAMS += \ systemd-multi-seat-x dist_udevrules_DATA += \ - src/login/70-uaccess.rules - -dist_udevrules_DATA += \ + src/login/70-uaccess.rules \ src/login/71-seat.rules nodist_udevrules_DATA += \ @@ -2674,12 +2861,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 @@ -2744,10 +2925,6 @@ src/%: src/%.m4 $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(M4) -P $(M4_DEFINES) < $< > $@ || rm $@ -src/load-fragment-gperf-nulstr.c: src/load-fragment-gperf.gperf - $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@ - M4_PROCESS_SYSTEM = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ || rm $@ @@ -2762,20 +2939,26 @@ units/%: units/%.m4 Makefile units/user/%: units/%.m4 Makefile $(M4_PROCESS_USER) +nodist_polkitpolicy_DATA = \ + $(polkitpolicy_in_files:.policy.in=.policy) \ + $(polkitpolicy_in_in_files:.policy.in.in=.policy) + +EXTRA_DIST += \ + $(polkitpolicy_in_files) \ + $(polkitpolicy_in_in_files) + CLEANFILES += \ $(nodist_systemunit_DATA) \ $(nodist_userunit_DATA) \ $(nodist_man_MANS) \ $(pkgconfigdata_DATA) \ $(pkgconfiglib_DATA) \ - $(nodist_polkitpolicy_DATA) \ - src/load-fragment-gperf.gperf \ - src/load-fragment-gperf.c \ - src/load-fragment-gperf-nulstr.c + $(nodist_polkitpolicy_DATA) if HAVE_XSLTPROC XSLTPROC_FLAGS = \ --nonet \ + --stringparam man.output.quietly 1 \ --stringparam funcsynopsis.style ansi XSLTPROC_PROCESS_MAN = \ @@ -2811,11 +2994,6 @@ endif DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h -org.freedesktop.systemd1.%.xml: systemd - $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \ - $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \ - $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp - CLEANFILES += \ $(dbusinterface_DATA) @@ -3051,10 +3229,11 @@ uninstall-hook: $(UNINSTALL_EXEC_HOOKS) install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS) -distcheck-hook: $(DISTCHECK_HOOKS) - distclean-local: $(DISTCLEAN_LOCAL_HOOKS) +clean-local: + rm -rf $(abs_srcdir)/install-tree + DISTCHECK_CONFIGURE_FLAGS = \ --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \ --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \ @@ -3062,14 +3241,29 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ --with-rootprefix=$$dc_install_base \ - --disable-split-usr \ + --disable-split-usr + +if ENABLE_GTK_DOC +DISTCHECK_CONFIGURE_FLAGS += \ --enable-gtk-doc +endif upload: all distcheck cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/ scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/ - scp man/*.html fdo:/srv/www.freedesktop.org/www/software/systemd/man/ scp man/*.html tango:public/systemd-man/ +doc-sync: all + gtkdoc-rebase --html-dir=docs/libudev/html --online + rsync -av --delete docs/libudev/html/ --omit-dir-times www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/libudev/ + gtkdoc-rebase --html-dir=docs/gudev/html --online + rsync -av --delete docs/gudev/html/ --omit-dir-times www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/gudev/ + rsync -av --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/ + git-tag: git tag "v$(VERSION)" -m "systemd $(VERSION)" + +install-tree: all + rm -rf $(abs_srcdir)/install-tree + make install DESTDIR=$(abs_srcdir)/install-tree + tree $(abs_srcdir)/install-tree