X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=69a842b77c8be120037a09073519f534a9084cf3;hb=d4205751d4643c272059a3728045929dd0e5e800;hp=61891d47a5cdb4452cf76efeb496ffe9d9f07477;hpb=41e5171419f5f9c08a338ea8b2ab8ea89c23c4ab;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 61891d47a..3c590094d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,29 +23,32 @@ AM_MAKEFLAGS = --no-print-directory SUBDIRS = . po -LIBUDEV_CURRENT=13 -LIBUDEV_REVISION=3 -LIBUDEV_AGE=13 +# remove targets if the command fails +.DELETE_ON_ERROR: + +LIBUDEV_CURRENT=3 +LIBUDEV_REVISION=0 +LIBUDEV_AGE=2 LIBGUDEV_CURRENT=1 -LIBGUDEV_REVISION=1 +LIBGUDEV_REVISION=2 LIBGUDEV_AGE=1 -LIBSYSTEMD_LOGIN_CURRENT=2 -LIBSYSTEMD_LOGIN_REVISION=1 -LIBSYSTEMD_LOGIN_AGE=2 +LIBSYSTEMD_LOGIN_CURRENT=3 +LIBSYSTEMD_LOGIN_REVISION=9 +LIBSYSTEMD_LOGIN_AGE=3 LIBSYSTEMD_DAEMON_CURRENT=0 -LIBSYSTEMD_DAEMON_REVISION=1 +LIBSYSTEMD_DAEMON_REVISION=5 LIBSYSTEMD_DAEMON_AGE=0 LIBSYSTEMD_ID128_CURRENT=0 -LIBSYSTEMD_ID128_REVISION=3 +LIBSYSTEMD_ID128_REVISION=15 LIBSYSTEMD_ID128_AGE=0 -LIBSYSTEMD_JOURNAL_CURRENT=0 -LIBSYSTEMD_JOURNAL_REVISION=3 -LIBSYSTEMD_JOURNAL_AGE=0 +LIBSYSTEMD_JOURNAL_CURRENT=6 +LIBSYSTEMD_JOURNAL_REVISION=0 +LIBSYSTEMD_JOURNAL_AGE=6 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -57,33 +60,40 @@ pkgconfigdatadir=$(datadir)/pkgconfig pkgconfiglibdir=$(libdir)/pkgconfig polkitpolicydir=$(datadir)/polkit-1/actions bashcompletiondir=$(sysconfdir)/bash_completion.d +rpmmacrosdir=$(sysconfdir)/rpm +sysvinitdir=$(SYSTEM_SYSVINIT_PATH) +varlogdir=$(localstatedir)/log # Our own, non-special dirs pkgsysconfdir=$(sysconfdir)/systemd userunitdir=$(prefix)/lib/systemd/user +userpresetdir=$(prefix)/lib/systemd/user-preset tmpfilesdir=$(prefix)/lib/tmpfiles.d sysctldir=$(prefix)/lib/sysctl.d -usergeneratordir=$(pkglibexecdir)/user-generators +usergeneratordir=$(prefix)/lib/systemd/user-generators pkgincludedir=$(includedir)/systemd systemgeneratordir=$(rootlibexecdir)/system-generators systemshutdowndir=$(rootlibexecdir)/system-shutdown +systemsleepdir=$(rootlibexecdir)/system-sleep systemunitdir=$(rootprefix)/lib/systemd/system +systempresetdir=$(rootprefix)/lib/systemd/system-preset udevlibexecdir=$(rootprefix)/lib/udev -udevhomedir = $(libexecdir)/udev -udevrulesdir = $(libexecdir)/udev/rules.d +udevhomedir=$(udevlibexecdir) +udevrulesdir=$(udevlibexecdir)/rules.d +udevhwdbdir=$(udevlibexecdir)/hwdb.d +catalogdir=$(prefix)/lib/systemd/catalog # And these are the special ones for / rootprefix=@rootprefix@ rootbindir=$(rootprefix)/bin rootlibexecdir=$(rootprefix)/lib/systemd -CLEANFILES = +CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = BUILT_SOURCES = INSTALL_EXEC_HOOKS = UNINSTALL_EXEC_HOOKS = INSTALL_DATA_HOOKS = -DISTCHECK_HOOKS = DISTCLEAN_LOCAL_HOOKS = pkginclude_HEADERS = noinst_LTLIBRARIES = @@ -91,17 +101,23 @@ lib_LTLIBRARIES = include_HEADERS = pkgconfiglib_DATA = polkitpolicy_in_files = +polkitpolicy_files = dist_udevrules_DATA = nodist_udevrules_DATA = dist_man_MANS = dist_pkgsysconf_DATA = +dist_pkgdata_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 \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \ -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \ -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \ @@ -113,6 +129,7 @@ AM_CPPFLAGS = \ -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \ -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \ -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \ + -DSYSTEMD_SLEEP_BINARY_PATH=\"$(rootlibexecdir)/systemd-sleep\" \ -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \ -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \ -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \ @@ -123,69 +140,59 @@ AM_CPPFLAGS = \ -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \ -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \ -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \ + -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \ -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \ -DX_SERVER=\"$(bindir)/X\" \ - -DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \ + -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \ -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \ -I $(top_srcdir)/src \ -I $(top_srcdir)/src/shared \ -I $(top_srcdir)/src/login \ -I $(top_srcdir)/src/journal \ -I $(top_srcdir)/src/systemd \ + -I $(top_builddir)/src/core \ -I $(top_srcdir)/src/core \ - -I $(top_srcdir)/src/udev + -I $(top_srcdir)/src/libudev \ + -I $(top_srcdir)/src/udev \ + $(OUR_CPPFLAGS) -AM_CFLAGS = $(WARNINGFLAGS) -AM_LDFLAGS = $(GCLDFLAGS) +AM_CFLAGS = $(OUR_CFLAGS) +AM_LDFLAGS = $(OUR_LDFLAGS) # ------------------------------------------------------------------------------ if TARGET_GENTOO AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ - -DKBD_SETFONT=\"/usr/bin/setfont\" \ - -DDEFAULT_FONT=\"LatArCyrHeb-16\" + -DKBD_SETFONT=\"/usr/bin/setfont\" else if TARGET_ARCH AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ - -DKBD_SETFONT=\"/usr/bin/setfont\" \ - -DDEFAULT_FONT=\"LatArCyrHeb-16\" + -DKBD_SETFONT=\"/usr/bin/setfont\" else if TARGET_FRUGALWARE AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ - -DKBD_SETFONT=\"/usr/bin/setfont\" \ - -DDEFAULT_FONT=\"LatArCyrHeb-16\" + -DKBD_SETFONT=\"/usr/bin/setfont\" else if TARGET_MANDRIVA AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/bin/loadkeys\" \ - -DKBD_SETFONT=\"/bin/setfont\" \ - -DDEFAULT_FONT=\"LatArCyrHeb-16\" -else -if TARGET_MEEGO -AM_CPPFLAGS += \ - -DKBD_LOADKEYS=\"/bin/loadkeys\" \ - -DKBD_SETFONT=\"/bin/setfont\" \ - -DDEFAULT_FONT=\"LatArCyrHeb-16\" + -DKBD_SETFONT=\"/bin/setfont\" else if TARGET_ANGSTROM AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ - -DKBD_SETFONT=\"/usr/bin/setfont\" \ - -DDEFAULT_FONT=\"LatArCyrHeb-16\" + -DKBD_SETFONT=\"/usr/bin/setfont\" else if TARGET_MAGEIA AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/bin/loadkeys\" \ - -DKBD_SETFONT=\"/bin/setfont\" \ - -DDEFAULT_FONT=\"LatArCyrHeb-16\" + -DKBD_SETFONT=\"/bin/setfont\" else AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/bin/loadkeys\" \ - -DKBD_SETFONT=\"/bin/setfont\" \ - -DDEFAULT_FONT=\"latarcyrheb-sun16\" -endif + -DKBD_SETFONT=\"/bin/setfont\" endif endif endif @@ -207,10 +214,11 @@ bin_PROGRAMS = \ systemd-cgtop \ systemd-stdio-bridge \ systemd-nspawn \ - systemd-detect-virt + systemd-detect-virt \ + systemd-delta dist_bin_SCRIPTS = \ - src/systemd-analyze + src/analyze/systemd-analyze rootlibexec_PROGRAMS = \ systemd \ @@ -220,31 +228,21 @@ rootlibexec_PROGRAMS = \ systemd-shutdownd \ systemd-shutdown \ systemd-modules-load \ - systemd-remount-api-vfs \ + systemd-remount-fs \ systemd-reply-password \ systemd-fsck \ systemd-timestamp \ systemd-ac-power \ - systemd-sysctl + systemd-sysctl \ + systemd-sleep 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 + systemd-getty-generator \ + systemd-fstab-generator \ + systemd-system-update-generator dist_bashcompletion_DATA = \ - src/systemd-bash-completion.sh + shell-completion/systemd-bash-completion.sh dist_tmpfiles_DATA = \ tmpfiles.d/systemd.conf \ @@ -274,7 +272,8 @@ dist_systemunit_DATA = \ units/nss-lookup.target \ units/nss-user-lookup.target \ units/mail-transfer-agent.target \ - units/http-daemon.target \ + units/hibernate.target \ + units/hybrid-sleep.target \ units/poweroff.target \ units/reboot.target \ units/rescue.target \ @@ -284,7 +283,9 @@ dist_systemunit_DATA = \ units/final.target \ units/umount.target \ units/sigpwr.target \ + units/sleep.target \ units/sockets.target \ + units/suspend.target \ units/swap.target \ units/systemd-initctl.socket \ units/systemd-shutdownd.socket \ @@ -295,7 +296,6 @@ dist_systemunit_DATA = \ units/sys-kernel-debug.mount \ units/sys-fs-fuse-connections.mount \ units/tmp.mount \ - units/remount-rootfs.service \ units/printer.target \ units/sound.target \ units/bluetooth.target \ @@ -305,17 +305,19 @@ 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-udevd-control.socket \ + units/systemd-udevd-kernel.socket \ + units/system-update.target nodist_systemunit_DATA = \ units/getty@.service \ units/serial-getty@.service \ units/console-shell.service \ + units/console-getty.service \ units/systemd-initctl.service \ units/systemd-shutdownd.service \ units/systemd-modules-load.service \ - units/systemd-remount-api-vfs.service \ + units/systemd-remount-fs.service \ units/systemd-update-utmp-runlevel.service \ units/systemd-update-utmp-shutdown.service \ units/systemd-tmpfiles-setup.service \ @@ -323,35 +325,40 @@ nodist_systemunit_DATA = \ units/systemd-ask-password-wall.service \ 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/udev.service \ - units/udev-trigger.service \ - units/udev-settle.service + units/systemd-hibernate.service \ + units/systemd-hybrid-sleep.service \ + units/systemd-suspend.service \ + units/systemd-halt.service \ + units/systemd-poweroff.service \ + units/systemd-reboot.service \ + units/systemd-kexec.service \ + units/systemd-fsck@.service \ + units/systemd-fsck-root.service \ + units/systemd-udevd.service \ + units/systemd-udev-trigger.service \ + units/systemd-udev-settle.service \ + units/debug-shell.service dist_userunit_DATA = \ units/user/default.target \ units/user/exit.target nodist_userunit_DATA = \ - units/user/exit.service + units/user/systemd-exit.service EXTRA_DIST += \ units/getty@.service.m4 \ units/serial-getty@.service.m4 \ units/console-shell.service.m4.in \ + units/console-getty.service.m4.in \ units/rescue.service.m4.in \ units/systemd-initctl.service.in \ units/systemd-shutdownd.service.in \ units/systemd-modules-load.service.in \ - units/systemd-remount-api-vfs.service.in \ + units/systemd-remount-fs.service.in \ units/systemd-update-utmp-runlevel.service.in \ units/systemd-update-utmp-shutdown.service.in \ units/systemd-tmpfiles-setup.service.in \ @@ -360,23 +367,27 @@ EXTRA_DIST += \ 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 \ - units/kexec.service.in \ - units/user/exit.service.in \ - units/fsck@.service.in \ - units/fsck-root.service.in \ + units/systemd-halt.service.in \ + units/systemd-poweroff.service.in \ + units/systemd-reboot.service.in \ + units/systemd-kexec.service.in \ + units/user/systemd-exit.service.in \ + units/systemd-fsck@.service.in \ + units/systemd-fsck-root.service.in \ units/user@.service.in \ - units/udev.service \ - units/udev-trigger.service \ - units/udev-settle.service \ + units/systemd-udevd.service \ + units/systemd-udev-trigger.service \ + units/systemd-udev-settle.service \ + units/debug-shell.service.in \ + units/systemd-hibernate.service.in \ + units/systemd-hybrid-sleep.service.in \ + units/systemd-suspend.service.in \ + units/quotaon.service.in \ introspect.awk \ man/custom-html.xsl if TARGET_FEDORA dist_systemunit_DATA += \ - units/fedora/prefdm.service \ units/fedora/rc-local.service \ units/fedora/halt-local.service systemgenerator_PROGRAMS += \ @@ -385,7 +396,6 @@ endif if TARGET_MANDRIVA dist_systemunit_DATA += \ - units/mandriva/prefdm.service \ units/fedora/rc-local.service \ units/fedora/halt-local.service systemgenerator_PROGRAMS += \ @@ -407,32 +417,12 @@ endif if TARGET_MAGEIA dist_systemunit_DATA += \ - units/mageia/prefdm.service \ units/fedora/rc-local.service \ units/fedora/halt-local.service systemgenerator_PROGRAMS += \ systemd-rc-local-generator endif -if HAVE_PLYMOUTH -dist_systemunit_DATA += \ - units/plymouth-start.service \ - units/plymouth-read-write.service \ - units/plymouth-quit.service \ - units/plymouth-quit-wait.service \ - units/plymouth-reboot.service \ - units/plymouth-kexec.service \ - units/plymouth-poweroff.service \ - units/plymouth-halt.service \ - units/systemd-ask-password-plymouth.path - -nodist_systemunit_DATA += \ - units/systemd-ask-password-plymouth.service - -EXTRA_DIST += \ - units/systemd-ask-password-plymouth.service.in -endif - dist_doc_DATA = \ README \ NEWS \ @@ -448,6 +438,7 @@ MANPAGES = \ man/systemd.1 \ man/systemctl.1 \ man/systemd-cgls.1 \ + man/systemd-delta.1 \ man/systemd-cgtop.1 \ man/systemd-nspawn.1 \ man/systemd-tmpfiles.8 \ @@ -464,9 +455,12 @@ MANPAGES = \ man/systemd.device.5 \ man/systemd.snapshot.5 \ man/systemd.exec.5 \ + man/systemd.kill.5 \ man/systemd.special.7 \ man/systemd.journal-fields.7 \ + man/kernel-command-line.7 \ man/daemon.7 \ + man/bootup.7 \ man/runlevel.8 \ man/telinit.8 \ man/halt.8 \ @@ -475,28 +469,207 @@ MANPAGES = \ man/systemd.conf.5 \ man/tmpfiles.d.5 \ man/hostname.5 \ - man/timezone.5 \ + man/localtime.5 \ man/machine-id.5 \ man/locale.conf.5 \ man/os-release.5 \ man/machine-info.5 \ man/modules-load.d.5 \ + man/systemd-modules-load.service.8 \ man/sysctl.d.5 \ + man/systemd-sysctl.service.8 \ 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/systemd-journald.service.8 \ + man/journalctl.1 \ + man/systemd-coredumpctl.1 \ + man/systemd-inhibit.1 \ + man/systemd-remount-fs.service.8 \ + man/systemd-update-utmp-runlevel.service.8 \ + man/systemd-initctl.service.8 \ + man/systemd-shutdownd.service.8 \ + man/systemd-suspend.service.8 \ + man/systemd-halt.service.8 \ + man/systemd-fsck@.service.8 \ + man/systemd-ask-password-console.service.8 \ + man/systemd-analyze.1 \ + man/systemd-tty-ask-password-agent.1 \ + man/systemd-getty-generator.8 \ + man/systemd-system-update-generator.8 \ + man/systemd-fstab-generator.8 \ + man/systemd.preset.5 \ + man/sd-id128.3 \ + man/sd_id128_to_string.3 \ + man/sd_id128_randomize.3 \ + man/sd_id128_get_machine.3 \ + man/sd-journal.3 \ + man/sd_journal_print.3 \ + man/sd_journal_stream_fd.3 \ + man/sd_journal_open.3 \ + man/sd_journal_next.3 \ + man/sd_journal_get_data.3 \ + man/sd_journal_get_realtime_usec.3 \ + man/sd_journal_get_cutoff_realtime_usec.3 \ + man/sd_journal_get_cursor.3 \ + man/sd_journal_get_fd.3 \ + man/sd_journal_get_usage.3 \ + man/sd_journal_add_match.3 \ + man/sd_journal_seek_head.3 \ + man/sd_journal_query_unique.3 MANPAGES_ALIAS = \ man/reboot.8 \ man/poweroff.8 \ - man/init.1 + man/init.1 \ + man/systemd-modules-load.8 \ + man/systemd-sysctl.8 \ + man/systemd-journald.socket.8 \ + man/systemd-journald.8 \ + man/systemd-remount-fs.8 \ + man/systemd-update-utmp-shutdown.service.8 \ + man/systemd-update-utmp.8 \ + man/systemd-initctl.socket.8 \ + man/systemd-initctl.8 \ + man/systemd-shutdownd.socket.8 \ + man/systemd-shutdownd.8 \ + man/systemd-hibernate.service.8 \ + man/systemd-hybrid-sleep.service.8 \ + man/systemd-sleep.8 \ + man/systemd-shutdown.8 \ + man/systemd-poweroff.service.8 \ + man/systemd-reboot.service.8 \ + man/systemd-kexec.service.8 \ + man/systemd-fsck.8 \ + man/systemd-fsck-root.service.8 \ + man/systemd-ask-password-console.path.8 \ + man/systemd-ask-password-wall.service.8 \ + man/systemd-ask-password-wall.path.8 \ + man/systemd-tmpfiles-setup.service.8 \ + man/systemd-tmpfiles-clean.service.8 \ + man/systemd-tmpfiles-clean.timer.8 \ + man/sd_id128_t.3 \ + man/SD_ID128_MAKE.3 \ + man/SD_ID128_CONST_STR.3 \ + man/SD_ID128_FORMAT_STR.3 \ + man/SD_ID128_FORMAT_VAL.3 \ + man/sd_id128_equal.3 \ + man/sd_id128_from_string.3 \ + man/sd_id128_get_boot.3 \ + man/sd_journal_printv.3 \ + man/sd_journal_send.3 \ + man/sd_journal_sendv.3 \ + man/sd_journal_perror.3 \ + man/SD_JOURNAL_SUPPRESS_LOCATION.3 \ + man/sd_journal_open_directory.3 \ + man/sd_journal_close.3 \ + man/sd_journal.3 \ + man/SD_JOURNAL_RUNTIME_ONLY.3 \ + man/SD_JOURNAL_SYSTEM_ONLY.3 \ + man/SD_JOURNAL_LOCAL_ONLY.3 \ + man/sd_journal_previous.3 \ + man/sd_journal_next_skip.3 \ + man/sd_journal_previous_skip.3 \ + man/SD_JOURNAL_FOREACH.3 \ + man/SD_JOURNAL_FOREACH_BACKWARDS.3 \ + man/sd_journal_enumerate_data.3 \ + man/sd_journal_restart_data.3 \ + man/SD_JOURNAL_FOREACH_DATA.3 \ + man/sd_journal_get_monotonic_usec.3 \ + man/sd_journal_get_cutoff_monotonic_usec.3 \ + man/sd_journal_reliable_fd.3 \ + man/sd_journal_process.3 \ + man/sd_journal_wait.3 \ + man/SD_JOURNAL_NOP.3 \ + man/SD_JOURNAL_APPEND.3 \ + man/SD_JOURNAL_INVALIDATE.3 \ + man/sd_journal_add_disjunction.3 \ + man/sd_journal_flush_matches.3 \ + man/sd_journal_seek_tail.3 \ + man/sd_journal_seek_monotonic_usec.3 \ + man/sd_journal_seek_realtime_usec.3 \ + man/sd_journal_seek_cursor.3 \ + man/sd_journal_test_cursor.3 \ + man/sd_journal_enumerate_unique.3 \ + man/sd_journal_restart_unique.3 \ + man/SD_JOURNAL_FOREACH_UNIQUE.3 man/reboot.8: man/halt.8 man/poweroff.8: man/halt.8 man/init.1: man/systemd.1 +man/systemd-modules-load.8: man/systemd-modules-load.service.8 +man/systemd-sysctl.8: man/systemd-sysctl.service.8 +man/systemd-journald.socket.8: man/systemd-journald.service.8 +man/systemd-journald.8: man/systemd-journald.service.8 +man/systemd-remount-fs.8: man/systemd-remount-fs.service.8 +man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8 +man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8 +man/systemd-initctl.socket.8: man/systemd-initctl.service.8 +man/systemd-initctl.8: man/systemd-initctl.service.8 +man/systemd-shutdownd.socket.8: man/systemd-shutdownd.service.8 +man/systemd-shutdownd.8: man/systemd-shutdownd.service.8 +man/systemd-hibernate.service.8: man/systemd-suspend.service.8 +man/systemd-hybrid-sleep.service.8: man/systemd-suspend.service.8 +man/systemd-sleep.8: man/systemd-suspend.service.8 +man/systemd-shutdown.8: man/systemd-halt.service.8 +man/systemd-poweroff.service.8: man/systemd-halt.service.8 +man/systemd-reboot.service.8: man/systemd-halt.service.8 +man/systemd-kexec.service.8: man/systemd-halt.service.8 +man/systemd-fsck.8: man/systemd-fsck@.service.8 +man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8 +man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8 +man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8 +man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8 +man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8 +man/systemd-tmpfiles-clean.service.8: man/systemd-tmpfiles.8 +man/systemd-tmpfiles-clean.timer.8: man/systemd-tmpfiles.8 +man/sd_id128_t.3: man/sd-id128.3 +man/SD_ID128_MAKE.3: man/sd-id128.3 +man/SD_ID128_CONST_STR.3: man/sd-id128.3 +man/SD_ID128_FORMAT_STR.3: man/sd-id128.3 +man/SD_ID128_FORMAT_VAL.3: man/sd-id128.3 +man/sd_id128_equal.3: man/sd-id128.3 +man/sd_id128_from_string.3: man/sd_id128_to_string.3 +man/sd_id128_get_boot.3: man/sd_id128_get_machine.3 +man/sd_journal_printv.3: man/sd_journal_print.3 +man/sd_journal_send.3: man/sd_journal_print.3 +man/sd_journal_sendv.3: man/sd_journal_print.3 +man/sd_journal_perror.3: man/sd_journal_print.3 +man/SD_JOURNAL_SUPPRESS_LOCATION.3: man/sd_journal_print.3 +man/sd_journal_open_directory.3: man/sd_journal_open.3 +man/sd_journal_close.3: man/sd_journal_open.3 +man/sd_journal.3: man/sd_journal_open.3 +man/SD_JOURNAL_RUNTIME_ONLY.3: man/sd_journal_open.3 +man/SD_JOURNAL_SYSTEM_ONLY.3: man/sd_journal_open.3 +man/SD_JOURNAL_LOCAL_ONLY.3: man/sd_journal_open.3 +man/sd_journal_previous.3: man/sd_journal_next.3 +man/sd_journal_next_skip.3: man/sd_journal_next.3 +man/sd_journal_previous_skip.3: man/sd_journal_next.3 +man/SD_JOURNAL_FOREACH.3: man/sd_journal_next.3 +man/SD_JOURNAL_FOREACH_BACKWARDS.3: man/sd_journal_next.3 +man/sd_journal_enumerate_data.3: man/sd_journal_get_data.3 +man/sd_journal_restart_data.3: man/sd_journal_get_data.3 +man/SD_JOURNAL_FOREACH_DATA.3: man/sd_journal_get_data.3 +man/sd_journal_get_monotonic_usec.3: man/sd_journal_get_realtime_usec.3 +man/sd_journal_get_cutoff_monotonic_usec.3: man/sd_journal_get_cutoff_realtime_usec.3 +man/sd_journal_reliable_fd.3: man/sd_journal_get_fd.3 +man/sd_journal_process.3: man/sd_journal_get_fd.3 +man/sd_journal_wait.3: man/sd_journal_get_fd.3 +man/SD_JOURNAL_NOP.3: man/sd_journal_get_fd.3 +man/SD_JOURNAL_APPEND.3: man/sd_journal_get_fd.3 +man/SD_JOURNAL_INVALIDATE.3: man/sd_journal_get_fd.3 +man/sd_journal_add_disjunction.3: man/sd_journal_add_match.3 +man/sd_journal_flush_matches.3: man/sd_journal_add_match.3 +man/sd_journal_seek_tail.3: man/sd_journal_seek_head.3 +man/sd_journal_seek_monotonic_usec.3: man/sd_journal_seek_head.3 +man/sd_journal_seek_realtime_usec.3: man/sd_journal_seek_head.3 +man/sd_journal_seek_cursor.3: man/sd_journal_seek_head.3 +man/sd_journal_test_cursor.3: man/sd_journal_get_cursor.3 +man/sd_journal_enumerate_unique.3: man/sd_journal_query_unique.3 +man/sd_journal_restart_unique.3: man/sd_journal_query_unique.3 +man/SD_JOURNAL_FOREACH_UNIQUE.3: man/sd_journal_query_unique.3 XML_FILES = \ ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} @@ -508,35 +681,93 @@ man_MANS = \ noinst_DATA = \ ${XML_FILES:.xml=.html} + +CLEANFILES += \ + $(MANPAGES) \ + $(MANPAGES_ALIAS) \ + ${XML_FILES:.xml=.html} + +if HAVE_PYTHON +noinst_DATA += \ + man/index.html + +CLEANFILES += \ + man/index.html + +man/index.html: make-man-index.py $(XML_FILES) + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(PYTHON) $^ > $@ + +MANPAGES += \ + man/systemd.directives.5 + +EXTRA_DIST += \ + man/index.html + +XML_DIRECTIVE_FILES = \ + man/systemd.unit.xml \ + man/systemd.service.xml \ + man/systemd.socket.xml \ + man/systemd.mount.xml \ + man/systemd.automount.xml \ + man/systemd.swap.xml \ + man/systemd.target.xml \ + man/systemd.path.xml \ + man/systemd.timer.xml \ + man/systemd.snapshot.xml \ + man/systemd.exec.xml \ + man/systemd.kill.xml \ + man/systemd.device.xml \ + man/systemd.conf.xml \ + man/systemd.journal-fields.xml + +man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES) + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(PYTHON) $^ > $@ + +EXTRA_DIST += \ + man/systemd.directives.xml + +endif + endif EXTRA_DIST += \ $(XML_FILES) \ ${XML_FILES:.xml=.html} \ $(MANPAGES) \ - $(MANPAGES_ALIAS) + $(MANPAGES_ALIAS) \ + make-man-index.py \ + make-directive-index.py # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ libsystemd-shared.la libsystemd_shared_la_SOURCES = \ - src/linux/auto_dev-ioctl.h \ - src/linux/fanotify.h \ + src/shared/linux/auto_dev-ioctl.h \ + src/shared/linux/fanotify.h \ + src/shared/linux/seccomp.h \ + src/shared/linux/seccomp-bpf.h \ + src/shared/missing.h \ src/shared/list.h \ src/shared/macro.h \ src/shared/def.h \ - src/shared/missing.h \ + src/shared/sparse-endian.h \ src/shared/util.c \ src/shared/util.h \ src/shared/virt.c \ src/shared/virt.h \ + src/shared/path-util.c \ + src/shared/path-util.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/strbuf.c \ + src/shared/strbuf.h \ src/shared/conf-parser.c \ src/shared/conf-parser.h \ src/shared/log.c \ @@ -552,6 +783,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/ioprio.h \ src/shared/socket-util.c \ src/shared/socket-util.h \ + src/shared/conf-files.c \ + src/shared/conf-files.h \ src/shared/cgroup-util.c \ src/shared/cgroup-util.h \ src/shared/cgroup-show.c \ @@ -564,20 +797,16 @@ libsystemd_shared_la_SOURCES = \ src/shared/watchdog.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-setup.c \ - src/shared/machine-id-setup.h \ - src/shared/loopback-setup.h \ - src/shared/loopback-setup.c \ src/shared/specifier.c \ src/shared/specifier.h \ + src/shared/replace-var.c \ + src/shared/replace-var.h \ src/shared/spawn-polkit-agent.c \ - src/shared/spawn-polkit-agent.h - -libsystemd_shared_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) + src/shared/spawn-polkit-agent.h \ + src/shared/hwclock.c \ + src/shared/hwclock.h \ + src/shared/time-dst.c \ + src/shared/time-dst.h #------------------------------------------------------------------------------- noinst_LTLIBRARIES += \ @@ -600,25 +829,38 @@ libsystemd_dbus_la_LIBADD = \ # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ - libsystemd-label.la + libsystemd-units.la -libsystemd_label_la_SOURCES = \ +libsystemd_units_la_SOURCES = \ src/shared/install.c \ src/shared/install.h \ src/shared/path-lookup.c \ - src/shared/path-lookup.h \ + src/shared/path-lookup.h + +libsystemd_units_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libsystemd-label.la + +libsystemd_label_la_SOURCES = \ src/shared/cgroup-label.c \ src/shared/socket-label.c \ src/shared/label.c \ src/shared/label.h \ + src/shared/selinux-util.c \ + src/shared/selinux-util.h \ src/shared/mkdir.c \ src/shared/mkdir.h \ src/shared/ask-password-api.c \ - src/shared/ask-password-api.h + 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 = \ @@ -636,8 +878,9 @@ libsystemd_logs_la_CFLAGS = \ $(AM_CFLAGS) libsystemd_logs_la_LIBADD = \ - libsystemd-journal.la \ - libsystemd-id128.la + libsystemd-journal-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-shared.la # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -689,10 +932,14 @@ noinst_LTLIBRARIES += \ libsystemd_core_la_SOURCES = \ src/core/unit.c \ src/core/unit.h \ + src/core/unit-printf.c \ + src/core/unit-printf.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 \ @@ -719,6 +966,8 @@ libsystemd_core_la_SOURCES = \ src/core/load-dropin.h \ src/core/execute.c \ src/core/execute.h \ + src/core/kill.c \ + src/core/kill.h \ src/core/dbus.c \ src/core/dbus.h \ src/core/dbus-manager.c \ @@ -747,10 +996,14 @@ libsystemd_core_la_SOURCES = \ src/core/dbus-device.h \ src/core/dbus-execute.c \ src/core/dbus-execute.h \ + src/core/dbus-kill.c \ + src/core/dbus-kill.h \ src/core/dbus-path.c \ src/core/dbus-path.h \ src/core/cgroup.c \ src/core/cgroup.h \ + src/core/selinux-access.c \ + src/core/selinux-access.h \ src/core/selinux-setup.c \ src/core/selinux-setup.h \ src/core/ima-setup.c \ @@ -761,6 +1014,12 @@ libsystemd_core_la_SOURCES = \ 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 \ @@ -776,11 +1035,21 @@ libsystemd_core_la_SOURCES = \ src/core/special.h \ src/core/bus-errors.h \ src/core/build.h \ - src/core/sysfs-show.h + src/core/sysfs-show.h \ + src/core/switch-root.h \ + src/core/switch-root.c \ + src/core/killall.h \ + src/core/killall.c \ + src/core/syscall-list.c \ + src/core/syscall-list.h \ + src/core/audit-fd.c \ + src/core/audit-fd.h nodist_libsystemd_core_la_SOURCES = \ src/core/load-fragment-gperf.c \ - src/core/load-fragment-gperf-nulstr.c + src/core/load-fragment-gperf-nulstr.c \ + src/core/syscall-from-name.h \ + src/core/syscall-to-name.h libsystemd_core_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -792,11 +1061,13 @@ libsystemd_core_la_CFLAGS = \ libsystemd_core_la_LIBADD = \ libsystemd-capability.la \ + libsystemd-units.la \ libsystemd-label.la \ libsystemd-shared.la \ libsystemd-dbus.la \ + libsystemd-audit.la \ + libsystemd-id128-internal.la \ libudev.la \ - $(DBUS_LIBS) \ $(LIBWRAP_LIBS) \ $(PAM_LIBS) \ $(AUDIT_LIBS) \ @@ -804,8 +1075,8 @@ libsystemd_core_la_LIBADD = \ $(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 $@ + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(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 ";" }' < $< > $@ EXTRA_DIST += \ src/core/load-fragment-gperf.gperf.m4 @@ -813,7 +1084,29 @@ EXTRA_DIST += \ CLEANFILES += \ src/core/load-fragment-gperf.gperf \ src/core/load-fragment-gperf.c \ - src/core/load-fragment-gperf-nulstr.c + src/core/load-fragment-gperf-nulstr.c \ + src/core/syscall-list.txt \ + src/core/syscall-from-name.gperf + +BUILT_SOURCES += \ + src/core/syscall-from-name.h \ + src/core/syscall-to-name.h + +src/core/syscall-list.txt: Makefile + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+\(?.*[0-9]+.*\)?/ { sub(/__NR_/, "", $$2); print $$2; }' > $@ + +src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@ + +src/core/syscall-from-name.h: src/core/syscall-from-name.gperf Makefile + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_syscall -H hash_syscall_name -p -C < $< > $@ + +src/core/syscall-to-name.h: src/core/syscall-list.txt Makefile + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const syscall_names[] = { "} { printf "[__NR_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@ # ------------------------------------------------------------------------------ systemd_SOURCES = \ @@ -826,7 +1119,7 @@ systemd_CFLAGS = \ systemd_LDADD = \ libsystemd-core.la \ libsystemd-daemon.la \ - libsystemd-id128.la \ + libsystemd-id128-internal.la \ libsystemd-dbus.la dist_pkgsysconf_DATA += \ @@ -865,10 +1158,55 @@ org.freedesktop.systemd1.%.xml: systemd pkgconfigdata_DATA = \ src/core/systemd.pc +nodist_rpmmacros_DATA = \ + src/core/macros.systemd + EXTRA_DIST += \ - src/core/systemd.pc.in + src/core/systemd.pc.in \ + src/core/macros.systemd.in + +CLEANFILES += \ + src/core/macros.systemd # ------------------------------------------------------------------------------ +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 \ + test-unit-name \ + test-log \ + test-unit-file \ + test-date \ + test-sleep \ + test-replace-var \ + test-sched-prio + +TESTS += \ + test-job-type \ + test-env-replace \ + test-strv \ + test-unit-name \ + test-unit-file \ + test-date \ + test-sleep \ + test-replace-var \ + test-sched-prio + +EXTRA_DIST += \ + test/sched_idle_bad.service \ + test/sched_idle_ok.service \ + test/sched_rr_bad.service \ + test/sched_rr_ok.service \ + test/sched_rr_change.service + test_engine_SOURCES = \ src/test/test-engine.c @@ -889,7 +1227,8 @@ test_job_type_CFLAGS = \ $(DBUS_CFLAGS) test_job_type_LDADD = \ - libsystemd-core.la + libsystemd-core.la \ + libsystemd-daemon.la test_ns_SOURCES = \ src/test/test-ns.c @@ -901,7 +1240,8 @@ test_loopback_SOURCES = \ src/test/test-loopback.c test_loopback_LDADD = \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-core.la test_hostname_SOURCES = \ src/test/test-hostname.c @@ -909,6 +1249,46 @@ test_hostname_SOURCES = \ test_hostname_LDADD = \ libsystemd-core.la +test_unit_name_SOURCES = \ + src/test/test-unit-name.c + +test_unit_name_LDADD = \ + libsystemd-core.la + +test_unit_file_SOURCES = \ + src/test/test-unit-file.c + +test_unit_file_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +test_unit_file_LDADD = \ + libsystemd-core.la + +test_log_SOURCES = \ + src/test/test-log.c + +test_log_LDADD = \ + libsystemd-core.la + +test_date_SOURCES = \ + src/test/test-date.c + +test_date_LDADD = \ + libsystemd-core.la + +test_sleep_SOURCES = \ + src/test/test-sleep.c + +test_sleep_LDADD = \ + libsystemd-core.la + +test_replace_var_SOURCES = \ + src/test/test-replace-var.c + +test_replace_var_LDADD = \ + libsystemd-shared.la + test_daemon_SOURCES = \ src/test/test-daemon.c @@ -943,6 +1323,7 @@ test_install_CFLAGS = \ $(DBUS_CFLAGS) test_install_LDADD = \ + libsystemd-units.la \ libsystemd-label.la \ libsystemd-shared.la @@ -952,9 +1333,21 @@ test_watchdog_SOURCES = \ test_watchdog_LDADD = \ libsystemd-shared.la +test_sched_prio_SOURCES = \ + src/test/test-sched-prio.c + +test_sched_prio_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) \ + -D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)" + +test_sched_prio_LDADD = \ + libsystemd-core.la \ + libsystemd-daemon.la + # ------------------------------------------------------------------------------ systemd_initctl_SOURCES = \ - src/initctl.c + src/initctl/initctl.c systemd_initctl_CFLAGS = \ $(AM_CFLAGS) \ @@ -963,12 +1356,11 @@ systemd_initctl_CFLAGS = \ systemd_initctl_LDADD = \ libsystemd-shared.la \ libsystemd-daemon.la \ - libsystemd-dbus.la \ - $(DBUS_LIBS) + libsystemd-dbus.la # ------------------------------------------------------------------------------ systemd_update_utmp_SOURCES = \ - src/update-utmp.c + src/update-utmp/update-utmp.c systemd_update_utmp_CFLAGS = \ $(AM_CFLAGS) \ @@ -978,12 +1370,11 @@ systemd_update_utmp_CFLAGS = \ systemd_update_utmp_LDADD = \ libsystemd-shared.la \ libsystemd-dbus.la \ - $(DBUS_LIBS) \ $(AUDIT_LIBS) # ------------------------------------------------------------------------------ systemd_shutdownd_SOURCES = \ - src/shutdownd.c + src/shutdownd/shutdownd.c systemd_shutdownd_LDADD = \ libsystemd-label.la \ @@ -997,7 +1388,11 @@ pkginclude_HEADERS += \ systemd_shutdown_SOURCES = \ src/core/umount.c \ src/core/umount.h \ - src/core/shutdown.c + src/core/shutdown.c \ + src/core/mount-setup.c \ + src/core/mount-setup.h \ + src/core/killall.h \ + src/core/killall.c systemd_shutdown_LDADD = \ libsystemd-label.la \ @@ -1006,7 +1401,7 @@ systemd_shutdown_LDADD = \ # ------------------------------------------------------------------------------ systemd_modules_load_SOURCES = \ - src/modules-load.c + src/modules-load/modules-load.c systemd_modules_load_CFLAGS = \ $(AM_CFLAGS) \ @@ -1018,31 +1413,41 @@ systemd_modules_load_LDADD = \ # ------------------------------------------------------------------------------ systemd_tmpfiles_SOURCES = \ - src/tmpfiles.c + src/tmpfiles/tmpfiles.c systemd_tmpfiles_LDADD = \ libsystemd-label.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-capability.la # ------------------------------------------------------------------------------ systemd_machine_id_setup_SOURCES = \ - src/machine-id-setup/machine-id-setup-main.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-label.la \ libsystemd-shared.la \ - libsystemd-id128.la + libsystemd-id128-internal.la # ------------------------------------------------------------------------------ systemd_sysctl_SOURCES = \ - src/sysctl.c + src/sysctl/sysctl.c systemd_sysctl_LDADD = \ libsystemd-shared.la +# ------------------------------------------------------------------------------ +systemd_sleep_SOURCES = \ + src/sleep/sleep.c + +systemd_sleep_LDADD = \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ systemd_fsck_SOURCES = \ - src/fsck.c + src/fsck/fsck.c systemd_fsck_CFLAGS = \ $(AM_CFLAGS) \ @@ -1051,19 +1456,18 @@ systemd_fsck_CFLAGS = \ systemd_fsck_LDADD = \ libsystemd-shared.la \ libsystemd-dbus.la \ - libudev.la \ - $(DBUS_LIBS) + libudev.la # ------------------------------------------------------------------------------ systemd_timestamp_SOURCES = \ - src/timestamp.c + src/timestamp/timestamp.c systemd_timestamp_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_ac_power_SOURCES = \ - src/ac-power.c + src/ac-power/ac-power.c systemd_ac_power_LDADD = \ libsystemd-shared.la \ @@ -1071,37 +1475,70 @@ systemd_ac_power_LDADD = \ # ------------------------------------------------------------------------------ systemd_detect_virt_SOURCES = \ - src/detect-virt.c + src/detect-virt/detect-virt.c systemd_detect_virt_LDADD = \ libsystemd-shared.la +systemd-detect-virt-install-hook: + $(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt ||: + +INSTALL_EXEC_HOOKS += \ + systemd-detect-virt-install-hook + +# ------------------------------------------------------------------------------ +systemd_delta_SOURCES = \ + src/delta/delta.c + +systemd_delta_LDADD = \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ systemd_getty_generator_SOURCES = \ - src/getty-generator.c + src/getty-generator/getty-generator.c systemd_getty_generator_LDADD = \ libsystemd-label.la \ libsystemd-shared.la +# ------------------------------------------------------------------------------ +systemd_fstab_generator_SOURCES = \ + src/fstab-generator/fstab-generator.c \ + src/core/mount-setup.c + +systemd_fstab_generator_LDADD = \ + libsystemd-label.la \ + libsystemd-shared.la + +# ------------------------------------------------------------------------------ +systemd_system_update_generator_SOURCES = \ + src/system-update-generator/system-update-generator.c + +systemd_system_update_generator_LDADD = \ + 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-label.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ -systemd_remount_api_vfs_SOURCES = \ - src/remount-api-vfs.c +systemd_remount_fs_SOURCES = \ + src/remount-fs/remount-fs.c \ + src/core/mount-setup.c \ + src/core/mount-setup.h -systemd_remount_api_vfs_LDADD = \ +systemd_remount_fs_LDADD = \ + libsystemd-label.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_cgroups_agent_SOURCES = \ - src/cgroups-agent.c + src/cgroups-agent/cgroups-agent.c systemd_cgroups_agent_CFLAGS = \ $(AM_CFLAGS) \ @@ -1109,30 +1546,27 @@ systemd_cgroups_agent_CFLAGS = \ systemd_cgroups_agent_LDADD = \ libsystemd-shared.la \ - libsystemd-dbus.la \ - $(DBUS_LIBS) + libsystemd-dbus.la # ------------------------------------------------------------------------------ systemctl_SOURCES = \ - src/systemctl.c + src/systemctl/systemctl.c systemctl_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) systemctl_LDADD = \ + libsystemd-units.la \ libsystemd-label.la \ libsystemd-shared.la \ libsystemd-daemon.la \ - libsystemd-journal.la \ - libsystemd-id128.la \ libsystemd-dbus.la \ libsystemd-logs.la - $(DBUS_LIBS) # ------------------------------------------------------------------------------ systemd_notify_SOURCES = \ - src/notify.c \ + src/notify/notify.c \ src/readahead/sd-readahead.c systemd_notify_LDADD = \ @@ -1141,7 +1575,7 @@ systemd_notify_LDADD = \ # ------------------------------------------------------------------------------ systemd_ask_password_SOURCES = \ - src/ask-password.c + src/ask-password/ask-password.c systemd_ask_password_LDADD = \ libsystemd-label.la \ @@ -1149,34 +1583,39 @@ systemd_ask_password_LDADD = \ # ------------------------------------------------------------------------------ systemd_reply_password_SOURCES = \ - src/reply-password.c + src/reply-password/reply-password.c systemd_reply_password_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_cgls_SOURCES = \ - src/cgls.c + src/cgls/cgls.c systemd_cgls_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_cgtop_SOURCES = \ - src/cgtop.c + src/cgtop/cgtop.c systemd_cgtop_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_nspawn_SOURCES = \ - src/nspawn.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-label.la \ libsystemd-capability.la \ libsystemd-shared.la \ - libsystemd-daemon.la + libsystemd-daemon.la \ + libsystemd-id128-internal.la # ------------------------------------------------------------------------------ systemd_stdio_bridge_SOURCES = \ @@ -1187,7 +1626,7 @@ systemd_stdio_bridge_LDADD = \ # ------------------------------------------------------------------------------ systemd_tty_ask_password_agent_SOURCES = \ - src/tty-ask-password-agent.c + src/tty-ask-password-agent/tty-ask-password-agent.c systemd_tty_ask_password_agent_LDADD = \ libsystemd-label.la \ @@ -1214,7 +1653,7 @@ pkginclude_HEADERS += \ # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libsystemd-daemon-install-hook: if test "$(libdir)" != "$(rootlibdir)"; then \ - mkdir -p $(DESTDIR)$(rootlibdir) && \ + $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \ so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \ ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-daemon.so && \ @@ -1237,7 +1676,7 @@ pkgconfiglib_DATA += \ src/libsystemd-daemon/libsystemd-daemon.pc MANPAGES += \ - man/sd-daemon.7 \ + man/sd-daemon.3 \ man/sd_notify.3 \ man/sd_listen_fds.3 \ man/sd_is_fifo.3 \ @@ -1248,37 +1687,59 @@ MANPAGES_ALIAS += \ man/sd_is_socket_unix.3 \ man/sd_is_socket_inet.3 \ man/sd_is_mq.3 \ - man/sd_notifyf.3 + man/sd_notifyf.3 \ + man/SD_LISTEN_FDS_START.3 \ + man/SD_EMERG.3 \ + man/SD_ALERT.3 \ + man/SD_CRIT.3 \ + man/SD_ERR.3 \ + man/SD_WARNING.3 \ + man/SD_NOTICE.3 \ + man/SD_INFO.3 \ + man/SD_DEBUG.3 man/sd_is_socket.3: man/sd_is_fifo.3 man/sd_is_socket_unix.3: man/sd_is_fifo.3 man/sd_is_socket_inet.3: man/sd_is_fifo.3 man/sd_is_mq.3: man/sd_is_fifo.3 man/sd_notifyf.3: man/sd_notify.3 +man/SD_LISTEN_FDS_START.3: man/sd_listen_fds.3 +man/SD_EMERG.3: man/sd-daemon.3 +man/SD_ALERT.3: man/sd-daemon.3 +man/SD_CRIT.3: man/sd-daemon.3 +man/SD_ERR.3: man/sd-daemon.3 +man/SD_WARNING.3: man/sd-daemon.3 +man/SD_NOTICE.3: man/sd-daemon.3 +man/SD_INFO.3: man/sd-daemon.3 +man/SD_DEBUG.3: man/sd-daemon.3 EXTRA_DIST += \ 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 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 \ + src/libudev/libudev-hwdb-def.h \ + src/libudev/libudev-hwdb.c libudev_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1286,21 +1747,26 @@ libudev_la_CFLAGS = \ libudev_la_LDFLAGS = \ $(AM_LDFLAGS) \ - -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) + -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \ + -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym + +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 \ + src/libudev/libudev.sym 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: if test "$(libdir)" != "$(rootlibdir)"; then \ - mkdir -p $(DESTDIR)$(rootlibdir) && \ + $(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 && \ @@ -1319,32 +1785,34 @@ noinst_LTLIBRARIES += \ 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 + src/libudev/libudev-device-private.c \ + src/libudev/libudev-queue-private.c libudev_private_la_CFLAGS = \ $(AM_CFLAGS) \ - $(SELINUX_CFLAGS) -fvisibility=default libudev_private_la_LIBADD = \ - $(SELINUX_LIBS) + libsystemd-shared.la # ------------------------------------------------------------------------------ MANPAGES += \ man/udev.7 \ man/udevadm.8 \ - man/udevd.8 + man/systemd-udevd.service.8 + +MANPAGES_ALIAS += \ + man/systemd-udevd.8 \ + man/systemd-udevd-control.socket.8 \ + man/systemd-udevd-kernel.socket.8 + +man/systemd-udevd.8: man/systemd-udevd.service.8 +man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8 +man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8 udev-confdirs: - -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d - -mkdir -p $(DESTDIR)$(libexecdir)/udev/devices + -$(MKDIR_P) $(DESTDIR)$(sysconfdir)/udev/rules.d + -$(MKDIR_P) $(DESTDIR)$(sysconfdir)/udev/hwdb.d INSTALL_DATA_HOOKS += udev-confdirs @@ -1357,12 +1825,21 @@ dist_udevrules_DATA += \ rules/60-persistent-input.rules \ rules/60-persistent-alsa.rules \ rules/60-persistent-storage.rules \ + rules/64-btrfs.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 +dist_udevhwdb_DATA = \ + hwdb/20-pci-vendor-product.hwdb \ + hwdb/20-pci-classes.hwdb \ + hwdb/20-usb-vendor-product.hwdb \ + hwdb/20-usb-classes.hwdb \ + hwdb/20-acpi-vendor.hwdb \ + hwdb/20-OUI.hwdb + udevconfdir = $(sysconfdir)/udev dist_udevconf_DATA = \ src/udev/udev.conf @@ -1380,30 +1857,30 @@ CLEANFILES += \ src/udev/udev.pc EXTRA_DIST += \ - units/udev.service.in \ - units/udev-trigger.service.in \ - units/udev-settle.service.in + units/systemd-udevd.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-udevd.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 - 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 + $(MKDIR_P) $(DESTDIR)$(systemunitdir)/sockets.target.wants + ln -sf ../systemd-udevd-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-control.socket + ln -sf ../systemd-udevd-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-kernel.socket + $(MKDIR_P) $(DESTDIR)$(systemunitdir)/sysinit.target.wants + ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service + ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.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 @@ -1417,12 +1894,15 @@ libudev_core_la_SOURCES = \ src/udev/udev-ctrl.c \ src/udev/udev-builtin.c \ src/udev/udev-builtin-blkid.c \ + src/udev/udev-builtin-btrfs.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-net_id.c \ src/udev/udev-builtin-path_id.c \ - src/udev/udev-builtin-usb_id.c + src/udev/udev-builtin-usb_id.c \ + src/libsystemd-daemon/sd-daemon.c libudev_core_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1431,30 +1911,29 @@ libudev_core_la_CFLAGS = \ libudev_core_la_LIBADD = \ libudev-private.la \ - libsystemd-daemon.la \ + libsystemd-label.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)\" + -DFIRMWARE_PATH="$(FIRMWARE_PATH)" if HAVE_ACL libudev_core_la_SOURCES += \ src/udev/udev-builtin-uaccess.c \ - src/login/logind-acl.c + src/login/logind-acl.c \ + src/login/sd-login.c libudev_core_la_LIBADD += \ - libsystemd-login.la \ libsystemd-acl.la endif -udevd_SOURCES = \ +systemd_udevd_SOURCES = \ src/udev/udevd.c -udevd_LDADD = \ +systemd_udevd_LDADD = \ libudev-core.la udevadm_SOURCES = \ @@ -1462,6 +1941,7 @@ udevadm_SOURCES = \ src/udev/udevadm-info.c \ src/udev/udevadm-control.c \ src/udev/udevadm-monitor.c \ + src/udev/udevadm-hwdb.c \ src/udev/udevadm-settle.c \ src/udev/udevadm-trigger.c \ src/udev/udevadm-test.c \ @@ -1472,43 +1952,54 @@ udevadm_LDADD = \ 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 = \ - src/udev/test-udev.c + src/test/test-udev.c test_udev_LDADD = \ libudev-core.la \ - libudev-private.la \ - libsystemd-shared.la + libsystemd-shared.la \ + $(BLKID_LIBS) \ + $(KMOD_LIBS) \ + $(SELINUX_LIBS) + +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_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)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 = \ @@ -1533,7 +2024,7 @@ udevlibexec_PROGRAMS += \ cdrom_id dist_udevrules_DATA += \ - src/udev/cdrom_id/60-cdrom_id.rules + rules/60-cdrom_id.rules # ------------------------------------------------------------------------------ collect_SOURCES = \ @@ -1573,7 +2064,7 @@ udevlibexec_PROGRAMS += \ v4l_id dist_udevrules_DATA += \ - src/udev/v4l_id/60-persistent-v4l.rules + rules/60-persistent-v4l.rules # ------------------------------------------------------------------------------ accelerometer_SOURCES = \ @@ -1587,54 +2078,53 @@ 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 - -EXTRA_DIST += \ - src/udev/gudev/gudev-1.0.pc.in + src/gudev/gudev-1.0.pc 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) @@ -1643,10 +2133,8 @@ 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 \ + -I$(top_builddir)/src/gudev \ + -I$(top_srcdir)/src/gudev \ -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ -D_GUDEV_COMPILATION \ -DG_LOG_DOMAIN=\"GUdev\" @@ -1666,82 +2154,71 @@ libgudev_1_0_la_LDFLAGS = \ -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 +src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list + $(AM_V_at)$(MKDIR_P) $(dir $@) $(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\"" > $@ && \ +src/gudev/gudevmarshal.c: src/gudev/gudevmarshal.list + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(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/gudev/gudevenumtypes.%: src/gudev/gudevenumtypes.%.template src/gudev/gudevenums.h + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)glib-mkenums --template $^ > $@ -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 +if HAVE_INTROSPECTION -include $(INTROSPECTION_MAKEFILE) -src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la +src/gudev/GUdev-1.0.gir: libgudev-1.0.la -src_udev_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0 +src_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0 -src_udev_gudev_GUdev_1_0_gir_CFLAGS = \ +src_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 + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ + -I$(top_srcdir)/src/gdev \ + -I$(top_builddir)/src/gdev -src_udev_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la +src_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la -src_udev_gudev_GUdev_1_0_gir_SCANNERFLAGS = \ +src_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 +src_gudev_GUdev_1_0_gir_FILES = \ + src/gudev/gudev.h \ + src/gudev/gudevtypes.h \ + src/gudev/gudevenums.h \ + src/gudev/gudevenumtypes.h \ + src/gudev/gudevclient.h \ + src/gudev/gudevdevice.h \ + src/gudev/gudevenumerator.h \ + src/gudev/gudevclient.c \ + src/gudev/gudevdevice.c \ + 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 = $(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: if test "$(libdir)" != "$(rootlibdir)"; then \ - mkdir -p $(DESTDIR)$(rootlibdir) && \ + $(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 && \ @@ -1755,6 +2232,16 @@ INSTALL_EXEC_HOOKS += libgudev-install-move-hook UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook endif +EXTRA_DIST += \ + src/gudev/gudev-1.0.pc.in \ + 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 + + # ------------------------------------------------------------------------------ if ENABLE_KEYMAP keymap_SOURCES = \ @@ -1763,6 +2250,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 @@ -1784,88 +2274,91 @@ dist_udevhome_SCRIPTS = \ src/udev/keymap/findkeyboards \ src/udev/keymap/keyboard-force-release.sh -EXTRA_DIST += \ +TESTS += \ src/udev/keymap/check-keymaps.sh CLEANFILES += \ - $(nodist_keymap_SOURCES) \ src/udev/keymap/keys.txt \ - src/udev/keymap/keys-from-name.gperf + src/udev/keymap/keys-from-name.gperf \ + src/udev/keymap/keyboard-force-release.sh -udevkeymapdir = $(libexecdir)/udev/keymaps +udevkeymapdir = $(udevlibexecdir)/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 + 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/hewlett-packard_elitebook-8440p \ + 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/module-sony-vpc \ + 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 = $(udevlibexecdir)/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 + 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: Makefile + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+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 Makefile $(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 @@ -1873,12 +2366,12 @@ 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 +EXTRA_DIST += \ + src/udev/keymap/check-keymaps.sh \ + src/udev/keymap/keyboard-force-release.sh.in + # ------------------------------------------------------------------------------ mtd_probe_SOURCES = \ src/udev/mtd_probe/mtd_probe.c \ @@ -1889,7 +2382,7 @@ 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 @@ -1911,29 +2404,38 @@ libsystemd_id128_la_LDFLAGS = \ libsystemd_id128_la_LIBADD = \ libsystemd-shared.la +libsystemd_id128_internal_la_SOURCES = \ + $(libsystemd_id128_la_SOURCES) + test_id128_SOURCES = \ src/test/test-id128.c test_id128_LDADD = \ libsystemd-shared.la \ - libsystemd-id128.la + libsystemd-id128-internal.la noinst_PROGRAMS += \ test-id128 +TESTS += \ + test-id128 + pkginclude_HEADERS += \ src/systemd/sd-id128.h lib_LTLIBRARIES += \ libsystemd-id128.la +noinst_LTLIBRARIES += \ + libsystemd-id128-internal.la + pkgconfiglib_DATA += \ src/libsystemd-id128/libsystemd-id128.pc # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libsystemd-id128-install-hook: if test "$(libdir)" != "$(rootlibdir)"; then \ - mkdir -p $(DESTDIR)$(rootlibdir) && \ + $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-id128.so) && \ so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \ ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-id128.so && \ @@ -1956,101 +2458,141 @@ 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/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 = + src/journal/journald-server.h systemd_journald_LDADD = \ - libsystemd-label.la \ + libsystemd-journal-internal.la \ libsystemd-shared.la \ - libsystemd-audit.la \ - libsystemd-daemon.la \ - libsystemd-login.la \ - 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 + libsystemd-id128-internal.la systemd_cat_SOURCES = \ src/journal/cat.c systemd_cat_LDADD = \ libsystemd-shared.la \ - libsystemd-journal.la + libsystemd-journal-internal.la journalctl_SOURCES = \ src/journal/journalctl.c +journalctl_CFLAGS = \ + $(AM_CFLAGS) + journalctl_LDADD = \ libsystemd-shared.la \ - libsystemd-journal.la \ - libsystemd-id128.la \ + libsystemd-journal-internal.la \ + libsystemd-id128-internal.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 +if HAVE_QRENCODE +journalctl_SOURCES += \ + src/journal/journal-qrcode.c \ + src/journal/journal-qrcode.h -test_journal_LDADD = \ - libsystemd-label.la \ - libsystemd-shared.la \ - libsystemd-id128.la +journalctl_CFLAGS += \ + $(QRENCODE_CFLAGS) -if HAVE_XZ -test_journal_SOURCES += \ - src/journal/compress.c +journalctl_LDADD += \ + $(QRENCODE_LIBS) +endif -test_journal_CFLAGS = \ - $(AM_CFLAGS) \ - $(XZ_CFLAGS) +systemd_coredumpctl_SOURCES = \ + src/journal/coredumpctl.c -test_journal_LDADD += \ - $(XZ_LIBS) -endif +systemd_coredumpctl_LDADD = \ + libsystemd-shared.la \ + libsystemd-journal.la + +test_journal_SOURCES = \ + src/journal/test-journal.c + +test_journal_LDADD = \ + libsystemd-shared.la \ + libsystemd-journal-internal.la \ + libsystemd-id128-internal.la test_journal_send_SOURCES = \ src/journal/test-journal-send.c test_journal_send_LDADD = \ libsystemd-shared.la \ - libsystemd-journal.la + libsystemd-journal-internal.la \ + libsystemd-id128-internal.la + +test_journal_syslog_SOURCES = \ + src/journal/test-journal-syslog.c + +test_journal_syslog_LDADD = \ + libsystemd-journal-internal.la \ + libsystemd-shared.la \ + libsystemd-id128-internal.la + +test_journal_match_SOURCES = \ + src/journal/test-journal-match.c + +test_journal_match_LDADD = \ + libsystemd-shared.la \ + libsystemd-journal-internal.la \ + libsystemd-id128-internal.la + +test_journal_enum_SOURCES = \ + src/journal/test-journal-enum.c + +test_journal_enum_LDADD = \ + libsystemd-shared.la \ + libsystemd-journal-internal.la \ + libsystemd-id128-internal.la + +test_journal_stream_SOURCES = \ + src/journal/test-journal-stream.c + +test_journal_stream_LDADD = \ + libsystemd-shared.la \ + libsystemd-journal-internal.la \ + libsystemd-id128-internal.la + +test_journal_verify_SOURCES = \ + src/journal/test-journal-verify.c + +test_journal_verify_LDADD = \ + libsystemd-shared.la \ + libsystemd-journal-internal.la \ + libsystemd-id128-internal.la + +test_mmap_cache_SOURCES = \ + src/journal/test-mmap-cache.c + +test_mmap_cache_LDADD = \ + libsystemd-shared.la \ + libsystemd-journal-internal.la + +test_catalog_SOURCES = \ + src/journal/test-catalog.c + +test_catalog_LDADD = \ + libsystemd-shared.la \ + libsystemd-label.la \ + libsystemd-journal-internal.la \ + libsystemd-id128-internal.la libsystemd_journal_la_SOURCES = \ src/journal/sd-journal.c \ + src/systemd/sd-journal.h \ src/journal/journal-file.c \ + src/journal/journal-file.h \ + src/journal/journal-vacuum.c \ + src/journal/journal-vacuum.h \ + src/journal/journal-verify.c \ + src/journal/journal-verify.h \ src/journal/lookup3.c \ - src/journal/journal-send.c + src/journal/lookup3.h \ + src/journal/journal-send.c \ + src/journal/journal-def.h \ + src/journal/compress.h \ + src/journal/catalog.c \ + src/journal/catalog.h \ + src/journal/mmap-cache.c \ + src/journal/mmap-cache.h libsystemd_journal_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -2064,24 +2606,95 @@ libsystemd_journal_la_LDFLAGS = \ libsystemd_journal_la_LIBADD = \ libsystemd-shared.la \ - libsystemd-id128.la + libsystemd-label.la \ + libsystemd-id128-internal.la + +libsystemd_journal_internal_la_SOURCES = \ + $(libsystemd_journal_la_SOURCES) \ + src/journal/journald-kmsg.c \ + src/journal/journald-kmsg.h \ + src/journal/journald-syslog.c \ + src/journal/journald-syslog.h \ + src/journal/journald-stream.c \ + src/journal/journald-stream.h \ + src/journal/journald-server.c \ + src/journal/journald-server.h \ + src/journal/journald-console.c \ + src/journal/journald-console.h \ + src/journal/journald-native.c \ + src/journal/journald-native.h \ + src/journal/journald-rate-limit.c \ + src/journal/journald-rate-limit.h \ + src/journal/journal-internal.h + +libsystemd_journal_internal_la_CFLAGS = \ + $(AM_CFLAGS) + +libsystemd_journal_internal_la_LIBADD = \ + libsystemd-label.la \ + libsystemd-audit.la \ + libsystemd-daemon.la \ + libudev.la \ + libsystemd-shared.la \ + libsystemd-label.la + +nodist_libsystemd_journal_internal_la_SOURCES = \ + src/journal/journald-gperf.c + +if ENABLE_LOGIND +libsystemd_journal_internal_la_LIBADD += \ + libsystemd-login-internal.la +endif + +if HAVE_ACL +libsystemd_journal_internal_la_LIBADD += \ + libsystemd-acl.la +endif if HAVE_XZ libsystemd_journal_la_SOURCES += \ src/journal/compress.c libsystemd_journal_la_CFLAGS += \ - $(AM_CFLAGS) \ $(XZ_CFLAGS) libsystemd_journal_la_LIBADD += \ $(XZ_LIBS) + +libsystemd_journal_internal_la_CFLAGS += \ + $(XZ_CFLAGS) + +libsystemd_journal_internal_la_LIBADD += \ + $(XZ_LIBS) + +endif + +if HAVE_GCRYPT +libsystemd_journal_la_SOURCES += \ + src/journal/journal-authenticate.c \ + src/journal/journal-authenticate.h \ + src/journal/fsprg.c \ + src/journal/fsprg.h + +libsystemd_journal_la_CFLAGS += \ + $(GCRYPT_CFLAGS) \ + -Wno-pointer-arith + +libsystemd_journal_la_LIBADD += \ + $(GCRYPT_LIBS) + +libsystemd_journal_internal_la_CFLAGS += \ + $(GCRYPT_CFLAGS) \ + -Wno-pointer-arith + +libsystemd_journal_internal_la_LIBADD += \ + $(GCRYPT_LIBS) endif # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libsystemd-journal-install-hook: if test "$(libdir)" != "$(rootlibdir)"; then \ - mkdir -p $(DESTDIR)$(rootlibdir) && \ + $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-journal.so) && \ so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \ ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-journal.so && \ @@ -2099,7 +2712,23 @@ UNINSTALL_EXEC_HOOKS += \ noinst_PROGRAMS += \ test-journal \ - test-journal-send + test-journal-send \ + test-journal-syslog \ + test-journal-match \ + test-journal-enum \ + test-journal-stream \ + test-journal-verify \ + test-mmap-cache \ + test-catalog + +TESTS += \ + test-journal \ + test-journal-send \ + test-journal-syslog \ + test-journal-match \ + test-journal-stream \ + test-journal-verify \ + test-mmap-cache pkginclude_HEADERS += \ src/systemd/sd-journal.h \ @@ -2108,6 +2737,9 @@ pkginclude_HEADERS += \ lib_LTLIBRARIES += \ libsystemd-journal.la +noinst_LTLIBRARIES += \ + libsystemd-journal-internal.la + rootlibexec_PROGRAMS += \ systemd-journald @@ -2115,13 +2747,15 @@ rootbin_PROGRAMS += \ journalctl bin_PROGRAMS += \ + systemd-coredumpctl \ systemd-cat dist_systemunit_DATA += \ units/systemd-journald.socket nodist_systemunit_DATA += \ - units/systemd-journald.service + units/systemd-journald.service \ + units/systemd-journal-flush.service dist_pkgsysconf_DATA += \ src/journal/journald.conf @@ -2129,6 +2763,9 @@ dist_pkgsysconf_DATA += \ pkgconfiglib_DATA += \ src/journal/libsystemd-journal.pc +dist_catalog_DATA = \ + catalog/systemd.catalog + journal-install-data-hook: $(MKDIR_P) -m 0755 \ $(DESTDIR)$(systemunitdir)/sockets.target.wants \ @@ -2137,8 +2774,9 @@ journal-install-data-hook: rm -f systemd-journald.socket && \ $(LN_S) ../systemd-journald.socket ) ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \ - rm -f systemd-journald.service && \ - $(LN_S) ../systemd-journald.service ) + rm -f systemd-journald.service systemd-journal-flush.service && \ + $(LN_S) ../systemd-journald.service && \ + $(LN_S) ../systemd-journal-flush.service ) INSTALL_DATA_HOOKS += \ journal-install-data-hook @@ -2147,35 +2785,77 @@ EXTRA_DIST += \ src/journal/libsystemd-journal.pc.in \ src/journal/libsystemd-journal.sym \ units/systemd-journald.service.in \ + units/systemd-journal-flush.service.in \ src/journal/journald-gperf.gperf CLEANFILES += \ src/journal/journald-gperf.c +if HAVE_MICROHTTPD + +gatewayddocumentrootdir=$(pkgdatadir)/gatewayd + +rootlibexec_PROGRAMS += \ + systemd-journal-gatewayd + +systemd_journal_gatewayd_SOURCES = \ + src/journal/journal-gatewayd.c + +systemd_journal_gatewayd_LDADD = \ + libsystemd-shared.la \ + libsystemd-logs.la \ + libsystemd-journal-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon.la \ + $(MICROHTTPD_LIBS) + +systemd_journal_gatewayd_CFLAGS = \ + -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \ + $(AM_CFLAGS) \ + $(MICROHTTPD_CFLAGS) + +dist_systemunit_DATA += \ + units/systemd-journal-gatewayd.socket + +nodist_systemunit_DATA += \ + units/systemd-journal-gatewayd.service + +dist_gatewayddocumentroot_DATA = \ + src/journal/browse.html + +endif + +EXTRA_DIST += \ + units/systemd-journal-gatewayd.service.in + # ------------------------------------------------------------------------------ if ENABLE_COREDUMP systemd_coredump_SOURCES = \ src/journal/coredump.c systemd_coredump_LDADD = \ - libsystemd-journal.la \ - libsystemd-login.la \ + libsystemd-journal-internal.la \ libsystemd-label.la \ libsystemd-shared.la +if ENABLE_LOGIND +systemd_coredump_LDADD += \ + libsystemd-login-internal.la +endif + rootlibexec_PROGRAMS += \ systemd-coredump sysctl_DATA = \ sysctl.d/coredump.conf -EXTRA_DIST += \ - sysctl.d/coredump.conf.in - CLEANFILES += \ sysctl.d/coredump.conf endif +EXTRA_DIST += \ + sysctl.d/coredump.conf.in + # ------------------------------------------------------------------------------ if ENABLE_BINFMT systemd_binfmt_SOURCES = \ @@ -2209,11 +2889,17 @@ INSTALL_DATA_HOOKS += \ binfmt-install-data-hook MANPAGES += \ - man/binfmt.d.5 + man/binfmt.d.5 \ + man/systemd-binfmt.service.8 + +MANPAGES_ALIAS += \ + man/systemd-binfmt.8 + +man/systemd-binfmt.8: man/systemd-binfmt.service.8 +endif EXTRA_DIST += \ units/systemd-binfmt.service.in -endif # ------------------------------------------------------------------------------ if ENABLE_VCONSOLE @@ -2240,41 +2926,42 @@ INSTALL_DATA_HOOKS += \ vconsole-install-data-hook MANPAGES += \ - man/vconsole.conf.5 + man/vconsole.conf.5 \ + man/systemd-vconsole-setup.service.8 + +MANPAGES_ALIAS += \ + man/systemd-vconsole-setup.8 + +man/systemd-vconsole-setup.8: man/systemd-vconsole-setup.service.8 +endif EXTRA_DIST += \ units/systemd-vconsole-setup.service.in -endif # ------------------------------------------------------------------------------ if ENABLE_READAHEAD -systemd_readahead_collect_SOURCES = \ +systemd_readahead_SOURCES = \ + src/readahead/readahead.c \ src/readahead/readahead-collect.c \ + src/readahead/readahead-replay.c \ + src/readahead/readahead-analyze.c \ src/readahead/readahead-common.c \ src/readahead/readahead-common.h -systemd_readahead_collect_LDADD = \ +systemd_readahead_LDADD = \ libsystemd-shared.la \ libsystemd-daemon.la \ libudev.la -systemd_readahead_replay_SOURCES = \ - src/readahead/readahead-replay.c \ - src/readahead/readahead-common.c - -systemd_readahead_replay_LDADD = \ - libsystemd-shared.la \ - libsystemd-daemon.la \ - libudev.la - -pkginclude_HEADERS += \ +dist_doc_DATA += \ + src/readahead/sd-readahead.c \ src/systemd/sd-readahead.h rootlibexec_PROGRAMS += \ - systemd-readahead-collect \ - systemd-readahead-replay + systemd-readahead dist_systemunit_DATA += \ + units/systemd-readahead-drop.service \ units/systemd-readahead-done.timer nodist_systemunit_DATA += \ @@ -2282,34 +2969,59 @@ nodist_systemunit_DATA += \ units/systemd-readahead-replay.service \ units/systemd-readahead-done.service +MANPAGES += \ + man/sd_readahead.3 \ + man/sd-readahead.3 \ + man/systemd-readahead-replay.service.8 + +MANPAGES_ALIAS += \ + man/systemd-readahead-collect.service.8 \ + man/systemd-readahead-done.service.8 \ + man/systemd-readahead-done.timer.8 \ + man/systemd-readahead.8 + +man/systemd-readahead-collect.service.8: man/systemd-readahead-replay.service.8 +man/systemd-readahead-done.service.8: man/systemd-readahead-replay.service.8 +man/systemd-readahead-done.timer.8: man/systemd-readahead-replay.service.8 +man/systemd-readahead.8: man/systemd-readahead-replay.service.8 + +endif + EXTRA_DIST += \ units/systemd-readahead-collect.service.in \ units/systemd-readahead-replay.service.in \ units/systemd-readahead-done.service.in -MANPAGES += \ - man/sd_readahead.3 \ - man/sd-readahead.7 -endif - # ------------------------------------------------------------------------------ if ENABLE_QUOTACHECK rootlibexec_PROGRAMS += \ systemd-quotacheck nodist_systemunit_DATA += \ - units/quotacheck.service - -EXTRA_DIST += \ - units/quotacheck.service.in + units/systemd-quotacheck.service systemd_quotacheck_SOURCES = \ - src/quotacheck.c + src/quotacheck/quotacheck.c systemd_quotacheck_LDADD = \ libsystemd-shared.la + +MANPAGES += \ + man/systemd-quotacheck.service.8 + +MANPAGES_ALIAS += \ + man/systemd-quotacheck.8 + +man/systemd-quotacheck.8: man/systemd-quotacheck.service.8 + endif +EXTRA_DIST += \ + units/systemd-quotacheck.service.in + +nodist_systemunit_DATA += \ + units/quotaon.service + # ------------------------------------------------------------------------------ if ENABLE_RANDOMSEED rootlibexec_PROGRAMS += \ @@ -2319,12 +3031,8 @@ nodist_systemunit_DATA += \ units/systemd-random-seed-save.service \ units/systemd-random-seed-load.service -EXTRA_DIST += \ - units/systemd-random-seed-save.service.in \ - 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-label.la \ @@ -2343,8 +3051,23 @@ randomseed-install-data-hook: INSTALL_DATA_HOOKS += \ randomseed-install-data-hook + +MANPAGES += \ + man/systemd-random-seed-load.service.8 + +MANPAGES_ALIAS += \ + man/systemd-random-seed-save.service.8 \ + man/systemd-random-seed.8 + +man/systemd-random-seed-save.service.8: man/systemd-random-seed-load.service.8 +man/systemd-random-seed.8: man/systemd-random-seed-load.service.8 + endif +EXTRA_DIST += \ + units/systemd-random-seed-save.service.in \ + units/systemd-random-seed-load.service.in + # ------------------------------------------------------------------------------ if HAVE_LIBCRYPTSETUP rootlibexec_PROGRAMS += \ @@ -2385,6 +3108,17 @@ cryptsetup-install-data-hook: INSTALL_DATA_HOOKS += \ cryptsetup-install-data-hook + +MANPAGES += \ + man/systemd-cryptsetup@.service.8 \ + man/systemd-cryptsetup-generator.8 \ + man/crypttab.5 + +MANPAGES_ALIAS += \ + man/systemd-cryptsetup.8 + +man/systemd-cryptsetup.8: man/systemd-cryptsetup@.service.8 + endif # ------------------------------------------------------------------------------ @@ -2399,8 +3133,7 @@ systemd_hostnamed_CFLAGS = \ systemd_hostnamed_LDADD = \ libsystemd-shared.la \ libsystemd-daemon.la \ - libsystemd-dbus.la \ - $(DBUS_LIBS) + libsystemd-dbus.la rootlibexec_PROGRAMS += \ systemd-hostnamed @@ -2414,8 +3147,8 @@ dist_dbuspolicy_DATA += \ dist_dbussystemservice_DATA += \ src/hostname/org.freedesktop.hostname1.service -polkitpolicy_in_files += \ - src/hostname/org.freedesktop.hostname1.policy.in +polkitpolicy_files += \ + src/hostname/org.freedesktop.hostname1.policy dbusinterface_DATA += \ org.freedesktop.hostname1.xml @@ -2433,9 +3166,39 @@ hostnamed-install-data-hook: INSTALL_DATA_HOOKS += \ hostnamed-install-data-hook +MANPAGES += \ + man/systemd-hostnamed.service.8 + +MANPAGES_ALIAS += \ + man/systemd-hostnamed.8 + +man/systemd-hostnamed.8: man/systemd-hostnamed.service.8 + +hostnamectl_SOURCES = \ + src/hostname/hostnamectl.c + +hostnamectl_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +hostnamectl_LDADD = \ + libsystemd-shared.la \ + libsystemd-dbus.la \ + libsystemd-id128-internal.la + +bin_PROGRAMS += \ + hostnamectl + +MANPAGES += \ + man/hostnamectl.1 + +endif + +polkitpolicy_in_files += \ + src/hostname/org.freedesktop.hostname1.policy.in + EXTRA_DIST += \ units/systemd-hostnamed.service.in -endif # ------------------------------------------------------------------------------ if ENABLE_LOCALED @@ -2450,8 +3213,7 @@ systemd_localed_LDADD = \ libsystemd-label.la \ libsystemd-shared.la \ libsystemd-daemon.la \ - libsystemd-dbus.la \ - $(DBUS_LIBS) + libsystemd-dbus.la nodist_systemunit_DATA += \ units/systemd-localed.service @@ -2465,8 +3227,8 @@ dist_dbuspolicy_DATA += \ dist_dbussystemservice_DATA += \ src/locale/org.freedesktop.locale1.service -polkitpolicy_in_files += \ - src/locale/org.freedesktop.locale1.policy.in +polkitpolicy_files += \ + src/locale/org.freedesktop.locale1.policy dbusinterface_DATA += \ org.freedesktop.locale1.xml @@ -2484,10 +3246,15 @@ localed-install-data-hook: INSTALL_DATA_HOOKS += \ localed-install-data-hook -EXTRA_DIST += \ - units/systemd-localed.service.in +MANPAGES += \ + man/systemd-localed.service.8 + +MANPAGES_ALIAS += \ + man/systemd-localed.8 + +man/systemd-localed.8: man/systemd-localed.service.8 -dist_pkgdata_DATA = \ +dist_pkgdata_DATA += \ src/locale/kbd-model-map dist_noinst_SCRIPT = \ @@ -2496,8 +3263,32 @@ dist_noinst_SCRIPT = \ update-kbd-model-map: src/locale/generate-kbd-model-map > src/locale/kbd-model-map +localectl_SOURCES = \ + src/locale/localectl.c + +localectl_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +localectl_LDADD = \ + libsystemd-shared.la \ + libsystemd-dbus.la \ + libsystemd-id128-internal.la + +bin_PROGRAMS += \ + localectl + +MANPAGES += \ + man/localectl.1 + endif +polkitpolicy_in_files += \ + src/locale/org.freedesktop.locale1.policy.in + +EXTRA_DIST += \ + units/systemd-localed.service.in + # ------------------------------------------------------------------------------ if ENABLE_TIMEDATED systemd_timedated_SOURCES = \ @@ -2510,8 +3301,7 @@ systemd_timedated_CFLAGS = \ systemd_timedated_LDADD = \ libsystemd-shared.la \ libsystemd-daemon.la \ - libsystemd-dbus.la \ - $(DBUS_LIBS) + libsystemd-dbus.la rootlibexec_PROGRAMS += \ systemd-timedated @@ -2525,8 +3315,8 @@ dist_dbuspolicy_DATA += \ nodist_systemunit_DATA += \ units/systemd-timedated.service -polkitpolicy_in_files += \ - src/timedate/org.freedesktop.timedate1.policy.in +polkitpolicy_files += \ + src/timedate/org.freedesktop.timedate1.policy org.freedesktop.timedate1.xml: systemd-timedated $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \ @@ -2537,6 +3327,9 @@ dbusinterface_DATA += \ org.freedesktop.timedate1.xml timedated-install-data-hook: + $(MKDIR_P) -m 0755 \ + $(DESTDIR)$(prefix)/lib/systemd/ntp-units.d \ + $(DESTDIR)$(sysconfdir)/systemd/ntp-units.d ( cd $(DESTDIR)$(systemunitdir) && \ rm -f dbus-org.freedesktop.timedate1.service && \ $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service ) @@ -2544,9 +3337,38 @@ timedated-install-data-hook: INSTALL_DATA_HOOKS += \ timedated-install-data-hook +MANPAGES += \ + man/systemd-timedated.service.8 + +MANPAGES_ALIAS += \ + man/systemd-timedated.8 + +man/systemd-timedated.8: man/systemd-timedated.service.8 + +timedatectl_SOURCES = \ + src/timedate/timedatectl.c + +timedatectl_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +timedatectl_LDADD = \ + libsystemd-shared.la \ + libsystemd-dbus.la + +bin_PROGRAMS += \ + timedatectl + +MANPAGES += \ + man/timedatectl.1 + +endif + +polkitpolicy_in_files += \ + src/timedate/org.freedesktop.timedate1.policy.in + EXTRA_DIST += \ units/systemd-timedated.service.in -endif # ------------------------------------------------------------------------------ if ENABLE_LOGIND @@ -2556,12 +3378,16 @@ systemd_logind_SOURCES = \ src/login/logind-dbus.c \ src/login/logind-device.c \ src/login/logind-device.h \ + src/login/logind-button.c \ + src/login/logind-button.h \ src/login/logind-seat.c \ src/login/logind-seat.h \ src/login/logind-session.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 \ @@ -2580,8 +3406,7 @@ systemd_logind_LDADD = \ libsystemd-audit.la \ libsystemd-daemon.la \ libsystemd-dbus.la \ - libudev.la \ - $(DBUS_LIBS) + libudev.la if HAVE_ACL systemd_logind_SOURCES += \ @@ -2612,21 +3437,46 @@ loginctl_CFLAGS = \ loginctl_LDADD = \ libsystemd-shared.la \ libsystemd-dbus.la \ - libudev.la \ - $(DBUS_LIBS) + libudev.la rootbin_PROGRAMS += \ loginctl +systemd_inhibit_SOURCES = \ + src/login/inhibit.c + +systemd_inhibit_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +systemd_inhibit_LDADD = \ + libsystemd-shared.la \ + libsystemd-dbus.la + +rootbin_PROGRAMS += \ + systemd-inhibit + test_login_SOURCES = \ src/login/test-login.c test_login_LDADD = \ - libsystemd-login.la \ + libsystemd-login-internal.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 @@ -2644,6 +3494,9 @@ libsystemd_login_la_LDFLAGS = \ libsystemd_login_la_LIBADD = \ libsystemd-shared.la +libsystemd_login_internal_la_SOURCES = \ + $(libsystemd_login_la_SOURCES) + if HAVE_PAM pam_systemd_la_SOURCES = \ src/login/pam-module.c @@ -2665,9 +3518,9 @@ pam_systemd_la_LDFLAGS = \ pam_systemd_la_LIBADD = \ libsystemd-daemon.la \ libsystemd-audit.la \ + libsystemd-dbus.la \ libsystemd-shared.la \ - $(PAM_LIBS) \ - $(DBUS_LIBS) + $(PAM_LIBS) pamlib_LTLIBRARIES = \ pam_systemd.la @@ -2676,7 +3529,7 @@ endif # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libsystemd-login-install-hook: if test "$(libdir)" != "$(rootlibdir)"; then \ - mkdir -p $(DESTDIR)$(rootlibdir) && \ + $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-login.so) && \ so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \ ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-login.so && \ @@ -2711,11 +3564,14 @@ pkginclude_HEADERS += \ lib_LTLIBRARIES += \ libsystemd-login.la +noinst_LTLIBRARIES += \ + libsystemd-login-internal.la + pkgconfiglib_DATA += \ src/login/libsystemd-login.pc -polkitpolicy_in_files += \ - src/login/org.freedesktop.login1.policy.in +polkitpolicy_files += \ + src/login/org.freedesktop.login1.policy logind-install-data-hook: $(MKDIR_P) -m 0755 \ @@ -2737,37 +3593,41 @@ systemd_multi_seat_x_SOURCES = \ systemd_multi_seat_x_LDADD = \ libsystemd-label.la \ - libsystemd-shared.la \ - libudev.la + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-multi-seat-x dist_udevrules_DATA += \ src/login/70-uaccess.rules \ - src/login/71-seat.rules + src/login/70-power-switch.rules nodist_udevrules_DATA += \ + src/login/71-seat.rules \ src/login/73-seat-late.rules MANPAGES += \ + man/systemd-logind.service.8 \ man/logind.conf.5 \ - man/sd-login.7 \ + man/sd-login.3 \ man/loginctl.1 \ man/sd_login_monitor_new.3 \ man/sd_pid_get_session.3 \ man/sd_uid_get_state.3 \ man/sd_session_is_active.3 \ man/sd_seat_get_active.3 \ - man/sd_get_seats.3 + man/sd_get_seats.3 \ + man/systemd-user-sessions.service.8 MANPAGES_ALIAS += \ man/sd_login_monitor_unref.3 \ man/sd_login_monitor_flush.3 \ man/sd_login_monitor_get_fd.3 \ + man/sd_login_monitor.3 \ man/sd_session_get_uid.3 \ man/sd_session_get_seat.3 \ man/sd_session_get_service.3 \ + man/sd_session_get_state.3 \ man/sd_session_get_type.3 \ man/sd_session_get_class.3 \ man/sd_session_get_display.3 \ @@ -2779,14 +3639,19 @@ MANPAGES_ALIAS += \ man/sd_seat_get_sessions.3 \ man/sd_seat_can_multi_session.3 \ man/sd_get_sessions.3 \ - man/sd_get_uids.3 + man/sd_get_uids.3 \ + man/systemd-logind.8 \ + man/systemd-user-sessions.8 +man/systemd-logind.8: man/systemd-logind.service.8 man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3 man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3 man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3 +man/sd_login_monitor.3: man/sd_login_monitor_new.3 man/sd_session_get_uid.3: man/sd_session_is_active.3 man/sd_session_get_seat.3: man/sd_session_is_active.3 man/sd_session_get_service.3: man/sd_session_is_active.3 +man/sd_session_get_state.3: man/sd_session_is_active.3 man/sd_session_get_type.3: man/sd_session_is_active.3 man/sd_session_get_class.3: man/sd_session_is_active.3 man/sd_session_get_display.3: man/sd_session_is_active.3 @@ -2799,19 +3664,57 @@ man/sd_seat_get_sessions.3: man/sd_seat_get_active.3 man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3 man/sd_get_sessions.3: man/sd_get_seats.3 man/sd_get_uids.3: man/sd_get_seats.3 +man/systemd-user-sessions.8: man/systemd-user-sessions.service.8 + +CLEANFILES += \ + src/login/logind-gperf.c \ + src/login/71-seat.rules \ + src/login/73-seat-late.rules +endif + +polkitpolicy_in_files += \ + src/login/org.freedesktop.login1.policy.in EXTRA_DIST += \ src/login/logind-gperf.gperf \ src/login/libsystemd-login.pc.in \ src/login/libsystemd-login.sym \ + src/login/71-seat.rules.in \ src/login/73-seat-late.rules.in \ units/systemd-logind.service.in \ units/systemd-user-sessions.service.in -CLEANFILES += \ - src/login/logind-gperf.c \ - src/login/73-seat-late.rules +# ------------------------------------------------------------------------------ + +if HAVE_PYTHON_DEVEL + +pkgpyexec_LTLIBRARIES = \ + _journal.la + +_journal_la_SOURCES = \ + src/python-systemd/_journal.c + +_journal_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=default \ + $(PYTHON_CFLAGS) + +_journal_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -shared \ + -module \ + -avoid-version + +_journal_la_LIBADD = \ + $(PYTHON_LIBS) \ + libsystemd-journal.la + +dist_pkgpyexec_PYTHON = \ + src/python-systemd/journal.py \ + src/python-systemd/__init__.py + endif + # ------------------------------------------------------------------------------ SED_PROCESS = \ @@ -2823,20 +3726,28 @@ SED_PROCESS = \ -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \ -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \ -e 's,@pkgdatadir\@,$(pkgdatadir),g' \ - -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \ -e 's,@systemunitdir\@,$(systemunitdir),g' \ -e 's,@userunitdir\@,$(userunitdir),g' \ + -e 's,@systempresetdir\@,$(systempresetdir),g' \ + -e 's,@userpresetdir\@,$(userpresetdir),g' \ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \ + -e 's,@RANDOM_SEED\@,$(localstatedir)/lib/random-seed,g' \ -e 's,@prefix\@,$(prefix),g' \ -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 $@ + -e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \ + -e 's,@sushell\@,$(sushell),g' \ + -e 's,@KILL\@,$(KILL),g' \ + -e 's,@QUOTAON\@,$(QUOTAON),g' \ + -e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \ + -e 's,@SYSTEM_SYSVINIT_PATH\@,$(sysvinitdir),g' \ + -e 's,@VARLOGDIR\@,$(varlogdir),g' \ + < $< > $@ units/%: units/%.in Makefile $(SED_PROCESS) @@ -2850,6 +3761,9 @@ sysctl.d/%: sysctl.d/%.in Makefile %.pc: %.pc.in Makefile $(SED_PROCESS) +src/core/macros.%: src/core/macros.%.in Makefile + $(SED_PROCESS) + src/%.policy.in: src/%.policy.in.in Makefile $(SED_PROCESS) @@ -2861,20 +3775,20 @@ src/%.policy.in: src/%.policy.in.in Makefile $(AM_V_GEN)chmod +x $@ src/%.c: src/%.gperf - $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(GPERF) < $< > $@ + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(GPERF) < $< > $@ src/%: src/%.m4 - $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(M4) -P $(M4_DEFINES) < $< > $@ || rm $@ + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(M4) -P $(M4_DEFINES) < $< > $@ M4_PROCESS_SYSTEM = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ || rm $@ + $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ M4_PROCESS_USER = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ || rm $@ + $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ units/%: units/%.m4 Makefile $(M4_PROCESS_SYSTEM) @@ -2883,7 +3797,7 @@ units/user/%: units/%.m4 Makefile $(M4_PROCESS_USER) nodist_polkitpolicy_DATA = \ - $(polkitpolicy_in_files:.policy.in=.policy) \ + $(polkitpolicy_files) \ $(polkitpolicy_in_in_files:.policy.in.in=.policy) EXTRA_DIST += \ @@ -2898,10 +3812,14 @@ CLEANFILES += \ $(pkgconfiglib_DATA) \ $(nodist_polkitpolicy_DATA) -if HAVE_XSLTPROC +if ENABLE_MANPAGES XSLTPROC_FLAGS = \ --nonet \ - --stringparam funcsynopsis.style ansi + --stringparam man.output.quietly 1 \ + --stringparam funcsynopsis.style ansi \ + --stringparam man.th.extra1.suppress 1 \ + --stringparam man.authors.section.enabled 0 \ + --stringparam man.copyright.section.enabled 0 XSLTPROC_PROCESS_MAN = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ @@ -2926,7 +3844,7 @@ man/%.7: man/%.xml man/%.8: man/%.xml $(XSLTPROC_PROCESS_MAN) -man/%.html: man/%.xml +man/%.html: man/%.xml man/custom-html.xsl $(XSLTPROC_PROCESS_HTML) CLEANFILES += \ @@ -2934,11 +3852,35 @@ CLEANFILES += \ ${XML_FILES:.xml=.html} endif -DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h +DBUS_PREPROCESS = $(CPP) -P $(CFLAGS) $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h CLEANFILES += \ $(dbusinterface_DATA) +if HAVE_SYSV_COMPAT +sysvinit_DATA = \ + docs/sysvinit/README + +varlog_DATA = \ + docs/var-log/README + +docs/sysvinit/README: docs/sysvinit/README.in + $(SED_PROCESS) + +docs/var-log/README: docs/var-log/README.in + $(SED_PROCESS) + +EXTRA_DIST += \ + docs/sysvinit/README.in \ + docs/var-log/README.in + +CLEANFILES += \ + docs/sysvinit/README \ + docs/var-log/README + +endif + + systemd-install-data-hook: $(MKDIR_P) -m 0755 \ $(DESTDIR)$(tmpfilesdir) \ @@ -2948,6 +3890,7 @@ systemd-install-data-hook: $(DESTDIR)$(prefix)/lib/sysctl.d \ $(DESTDIR)$(sysconfdir)/sysctl.d \ $(DESTDIR)$(systemshutdowndir) \ + $(DESTDIR)$(systemsleepdir) \ $(DESTDIR)$(systemgeneratordir) \ $(DESTDIR)$(usergeneratordir) $(MKDIR_P) -m 0755 \ @@ -2999,13 +3942,11 @@ systemd-install-data-hook: rm -f systemd-update-utmp-shutdown.service && \ $(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service ) ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \ - rm -f systemd-remount-api-vfs.service \ - fsck-root.service \ - remount-rootfs.service \ + rm -f systemd-remount-fs.service \ + systemd-fsck-root.service \ 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) ../systemd-remount-fs.service systemd-remount-fs.service && \ + $(LN_S) ../systemd-fsck-root.service systemd-fsck-root.service && \ $(LN_S) ../tmp.mount tmp.mount ) ( cd $(DESTDIR)$(userunitdir) && \ rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \ @@ -3063,76 +4004,17 @@ systemd-install-data-hook: ( cd $(DESTDIR)$(dbussessionservicedir) && \ rm -f org.freedesktop.systemd1.service && \ $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service ) -if HAVE_PLYMOUTH - $(MKDIR_P) -m 0755 \ - $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \ - $(DESTDIR)$(systemunitdir)/reboot.target.wants \ - $(DESTDIR)$(systemunitdir)/kexec.target.wants \ - $(DESTDIR)$(systemunitdir)/poweroff.target.wants \ - $(DESTDIR)$(systemunitdir)/halt.target.wants - ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \ - rm -f plymouth-start.service plymouth-read-write.service && \ - $(LN_S) ../plymouth-start.service plymouth-start.service && \ - $(LN_S) ../plymouth-read-write.service plymouth-read-write.service ) - ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \ - rm -f plymouth-quit.service plymouth-quit-wait.service && \ - $(LN_S) ../plymouth-quit.service plymouth-quit.service && \ - $(LN_S) ../plymouth-quit-wait.service plymouth-quit-wait.service ) - ( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \ - rm -f plymouth-reboot.service && \ - $(LN_S) ../plymouth-reboot.service plymouth-reboot.service ) - ( cd $(DESTDIR)$(systemunitdir)/kexec.target.wants && \ - rm -f plymouth-kexec.service && \ - $(LN_S) ../plymouth-kexec.service plymouth-kexec.service ) - ( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \ - rm -f plymouth-poweroff.service && \ - $(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service ) - ( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \ - rm -f plymouth-halt.service && \ - $(LN_S) ../plymouth-halt.service plymouth-halt.service ) -endif -if TARGET_MEEGO - $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants - ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \ - rm -f network.target && \ - $(LN_S) $(systemunitdir)/network.target network.target ) - ( cd $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants && \ - rm -f * ) - ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \ - rm -f * ) - ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \ - rm -f * ) - ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \ - rm -f * ) -endif if TARGET_FEDORA - $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants - ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \ - rm -f halt-local.service && \ - $(LN_S) $(systemunitdir)/halt-local.service halt-local.service ) ( cd $(DESTDIR)$(systemunitdir) && \ rm -f display-manager.service single.service && \ - $(LN_S) prefdm.service display-manager.service && \ $(LN_S) rescue.service single.service ) - ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \ - rm -f display-manager.service && \ - $(LN_S) $(systemunitdir)/display-manager.service display-manager.service ) endif if TARGET_MANDRIVA - $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants - ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \ - rm -f halt-local.service && \ - $(LN_S) $(systemunitdir)/halt-local.service halt-local.service ) ( cd $(DESTDIR)$(systemunitdir) && \ rm -f display-manager.service dm.service single.service && \ - $(LN_S) prefdm.service display-manager.service && \ - $(LN_S) prefdm.service dm.service && \ $(LN_S) rescue.service single.service ) - ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \ - rm -f display-manager.service && \ - $(LN_S) $(systemunitdir)/display-manager.service display-manager.service ) endif if TARGET_DEBIAN_OR_UBUNTU @@ -3142,27 +4024,14 @@ if TARGET_DEBIAN_OR_UBUNTU endif if TARGET_SUSE - $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants ( cd $(DESTDIR)$(systemunitdir) && \ rm -f local.service && \ $(LN_S) rc-local.service local.service ) - ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \ - rm -f halt-local.service && \ - $(LN_S) $(systemunitdir)/halt-local.service halt-local.service ) endif if TARGET_MAGEIA - $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants - ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \ - rm -f halt-local.service && \ - $(LN_S) $(systemunitdir)/halt-local.service halt-local.service ) ( cd $(DESTDIR)$(systemunitdir) && \ - rm -f display-manager.service && \ - $(LN_S) prefdm.service display-manager.service && \ - $(LN_S) prefdm.service dm.service ) - ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \ - rm -f display-manager.service && \ - $(LN_S) $(systemunitdir)/display-manager.service display-manager.service ) + rm -f display-manager.service ) endif install-exec-hook: $(INSTALL_EXEC_HOOKS) @@ -3171,25 +4040,50 @@ 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 + rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt + DISTCHECK_CONFIGURE_FLAGS = \ + --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \ --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-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 + +hwdb-update: + ( cd hwdb && \ + wget -N http://www.linux-usb.org/usb.ids && \ + wget -N http://pci-ids.ucw.cz/v2.2/pci.ids && \ + wget -N http://standards.ieee.org/develop/regauth/oui/oui.txt && \ + ./ids-update.pl ) 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