X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=b16c01ae6780c2c39456c3c6e4ab743fc909ea3a;hp=a3d5a181bb54c9de5fae88ce05f168541b9d77d0;hb=8351ceaea9480d9c2979aa2ff0f4982cfdfef58d;hpb=56a379a97e91380630653b85e5cb3612bf22ecf4 diff --git a/Makefile.am b/Makefile.am index a3d5a181b..b16c01ae6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,28 +24,28 @@ AM_MAKEFLAGS = --no-print-directory SUBDIRS = . po LIBUDEV_CURRENT=1 -LIBUDEV_REVISION=1 +LIBUDEV_REVISION=2 LIBUDEV_AGE=0 LIBGUDEV_CURRENT=1 LIBGUDEV_REVISION=2 LIBGUDEV_AGE=1 -LIBSYSTEMD_LOGIN_CURRENT=2 -LIBSYSTEMD_LOGIN_REVISION=4 -LIBSYSTEMD_LOGIN_AGE=2 +LIBSYSTEMD_LOGIN_CURRENT=3 +LIBSYSTEMD_LOGIN_REVISION=0 +LIBSYSTEMD_LOGIN_AGE=3 LIBSYSTEMD_DAEMON_CURRENT=0 LIBSYSTEMD_DAEMON_REVISION=2 LIBSYSTEMD_DAEMON_AGE=0 LIBSYSTEMD_ID128_CURRENT=0 -LIBSYSTEMD_ID128_REVISION=5 +LIBSYSTEMD_ID128_REVISION=6 LIBSYSTEMD_ID128_AGE=0 -LIBSYSTEMD_JOURNAL_CURRENT=1 -LIBSYSTEMD_JOURNAL_REVISION=1 -LIBSYSTEMD_JOURNAL_AGE=1 +LIBSYSTEMD_JOURNAL_CURRENT=2 +LIBSYSTEMD_JOURNAL_REVISION=0 +LIBSYSTEMD_JOURNAL_AGE=2 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -96,6 +96,7 @@ dist_udevrules_DATA = nodist_udevrules_DATA = dist_man_MANS = dist_pkgsysconf_DATA = +dist_pkgdata_DATA = dist_dbuspolicy_DATA = dbusinterface_DATA = dist_dbussystemservice_DATA = @@ -172,12 +173,6 @@ AM_CPPFLAGS += \ -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\" -else if TARGET_ANGSTROM AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ @@ -200,7 +195,6 @@ endif endif endif endif -endif # ------------------------------------------------------------------------------ rootbin_PROGRAMS = \ @@ -307,9 +301,8 @@ dist_systemunit_DATA = \ units/systemd-ask-password-wall.path \ units/systemd-ask-password-console.path \ units/syslog.target \ - units/systemd-udev-control.socket \ - units/systemd-udev-kernel.socket \ - units/systemd-timedated-ntp.target \ + units/systemd-udevd-control.socket \ + units/systemd-udevd-kernel.socket \ units/system-update.target nodist_systemunit_DATA = \ @@ -339,10 +332,10 @@ nodist_systemunit_DATA = \ units/systemd-kexec.service \ units/systemd-fsck@.service \ units/systemd-fsck-root.service \ - units/systemd-udev.service \ + units/systemd-udevd.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ - units/systemd-debug-shell.service + units/debug-shell.service dist_userunit_DATA = \ units/user/default.target \ @@ -377,10 +370,10 @@ EXTRA_DIST += \ units/systemd-fsck@.service.in \ units/systemd-fsck-root.service.in \ units/user@.service.in \ - units/systemd-udev.service \ + units/systemd-udevd.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ - units/systemd-debug-shell.service.in \ + units/debug-shell.service.in \ units/systemd-hibernate.service.in \ units/systemd-suspend.service.in \ introspect.awk \ @@ -493,7 +486,31 @@ MANPAGES = \ man/systemd-initctl.service.8 \ man/systemd-shutdownd.service.8 \ man/systemd-suspend.service.8 \ - man/systemd-halt.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_add_match.3 \ + man/sd_journal_seek_head.3 MANPAGES_ALIAS = \ man/reboot.8 \ @@ -501,29 +518,80 @@ MANPAGES_ALIAS = \ 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-sleep.8 \ man/systemd-shutdown.8 \ man/systemd-poweroff.service.8 \ man/systemd-reboot.service.8 \ - man/systemd-kexec.service.8 + man/systemd-kexec.service.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_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_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_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/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-sleep.8: man/systemd-suspend.service.8 @@ -531,6 +599,51 @@ 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-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_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_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_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 XML_FILES = \ ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} @@ -542,13 +655,31 @@ 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: $(XML_FILES) $(top_srcdir)/make-man-index.py + $(AM_V_GEN)$(PYTHON) $(top_srcdir)/make-man-index.py $(XML_FILES) > $@ || rm $@ +endif + endif EXTRA_DIST += \ $(XML_FILES) \ ${XML_FILES:.xml=.html} \ $(MANPAGES) \ - $(MANPAGES_ALIAS) + $(MANPAGES_ALIAS) \ + make-man-index.py # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -677,8 +808,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 += \ @@ -827,11 +959,17 @@ libsystemd_core_la_SOURCES = \ src/core/build.h \ src/core/sysfs-show.h \ src/core/switch-root.h \ - src/core/switch-root.c + src/core/switch-root.c \ + src/core/killall.h \ + src/core/killall.c \ + src/core/syscall-list.c \ + src/core/syscall-list.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) \ @@ -864,7 +1002,23 @@ 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 \ + src/core/syscall-from-name.h \ + src/core/syscall-to-name.h + +src/core/syscall-list.txt: Makefile + $(AM_V_GEN)cpp -dM -include sys/syscall.h < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@ || rm $@ + +src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile + $(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_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_GEN)$(AWK) 'BEGIN{ print "const char* const syscall_names[] = { "} { printf "[__NR_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@ # ------------------------------------------------------------------------------ systemd_SOURCES = \ @@ -877,7 +1031,7 @@ systemd_CFLAGS = \ systemd_LDADD = \ libsystemd-core.la \ libsystemd-daemon.la \ - libsystemd-id128.la \ + libsystemd-id128-internal.la \ libsystemd-dbus.la dist_pkgsysconf_DATA += \ @@ -944,7 +1098,8 @@ noinst_PROGRAMS += \ TESTS += \ test-job-type \ test-env-replace \ - test-strv + test-strv \ + test-unit-name test_engine_SOURCES = \ src/test/test-engine.c @@ -1083,7 +1238,9 @@ systemd_shutdown_SOURCES = \ src/core/umount.h \ src/core/shutdown.c \ src/core/mount-setup.c \ - src/core/mount-setup.h + src/core/mount-setup.h \ + src/core/killall.h \ + src/core/killall.c systemd_shutdown_LDADD = \ libsystemd-label.la \ @@ -1119,7 +1276,7 @@ systemd_machine_id_setup_SOURCES = \ systemd_machine_id_setup_LDADD = \ libsystemd-label.la \ libsystemd-shared.la \ - libsystemd-id128.la + libsystemd-id128-internal.la # ------------------------------------------------------------------------------ systemd_sysctl_SOURCES = \ @@ -1244,8 +1401,8 @@ systemctl_LDADD = \ libsystemd-label.la \ libsystemd-shared.la \ libsystemd-daemon.la \ - libsystemd-journal.la \ - libsystemd-id128.la \ + libsystemd-journal-internal.la \ + libsystemd-id128-internal.la \ libsystemd-dbus.la \ libsystemd-logs.la @@ -1360,7 +1517,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 \ @@ -1371,13 +1528,31 @@ 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 \ @@ -1505,21 +1680,21 @@ CLEANFILES += \ src/udev/udev.pc EXTRA_DIST += \ - units/systemd-udev.service.in \ + units/systemd-udevd.service.in \ units/systemd-udev-trigger.service.in \ units/systemd-udev-settle.service.in CLEANFILES += \ - units/systemd-udev.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 ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket - ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket + 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-udev.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev.service + 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 @@ -1615,22 +1790,10 @@ test_libudev_LDADD = \ libudev.la test_udev_SOURCES = \ - src/test/test-udev.c \ - $(libudev_core_la_SOURCES) \ - $(libudev_private_la_SOURCES) - -# The test-udev program needs everything compiled with relative path -# names for /sys, /dev, /run prefixed, pointing to our test/ directory. -test_udev_CFLAGS = \ - -DTEST_PREFIX=\"test\" \ - $(libudev_core_la_CFLAGS) \ - $(libudev_private_la_CFLAGS) - -test_udev_CPPFLAGS =\ - $(libudev_core_la_CPPFLAGS) + src/test/test-udev.c test_udev_LDADD = \ - libsystemd-label.la \ + libudev-core.la \ libsystemd-shared.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) \ @@ -2066,12 +2229,15 @@ 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 @@ -2085,6 +2251,9 @@ pkginclude_HEADERS += \ lib_LTLIBRARIES += \ libsystemd-id128.la +noinst_LTLIBRARIES += \ + libsystemd-id128-internal.la + pkgconfiglib_DATA += \ src/libsystemd-id128/libsystemd-id128.pc @@ -2137,11 +2306,11 @@ systemd_journald_LDADD = \ libsystemd-shared.la \ libsystemd-audit.la \ libsystemd-daemon.la \ - libsystemd-id128.la + libsystemd-id128-internal.la if ENABLE_LOGIND systemd_journald_LDADD += \ - libsystemd-login.la + libsystemd-login-internal.la endif if HAVE_ACL @@ -2166,47 +2335,48 @@ systemd_cat_SOURCES = \ systemd_cat_LDADD = \ libsystemd-shared.la \ - libsystemd-journal.la + libsystemd-journal-internal.la journalctl_SOURCES = \ src/journal/journalctl.c 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 + src/journal/test-journal.c test_journal_LDADD = \ - libsystemd-label.la \ libsystemd-shared.la \ - libsystemd-id128.la - -if HAVE_XZ -test_journal_SOURCES += \ - src/journal/compress.c - -test_journal_CFLAGS = \ - $(AM_CFLAGS) \ - $(XZ_CFLAGS) - -test_journal_LDADD += \ - $(XZ_LIBS) -endif + 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_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_stream_SOURCES = \ + src/journal/test-journal-stream.c + +test_journal_stream_LDADD = \ + libsystemd-shared.la \ + libsystemd-journal-internal.la \ + libsystemd-id128-internal.la libsystemd_journal_la_SOURCES = \ src/journal/sd-journal.c \ @@ -2226,7 +2396,10 @@ libsystemd_journal_la_LDFLAGS = \ libsystemd_journal_la_LIBADD = \ libsystemd-shared.la \ - libsystemd-id128.la + libsystemd-id128-internal.la + +libsystemd_journal_internal_la_SOURCES = \ + $(libsystemd_journal_la_SOURCES) if HAVE_XZ libsystemd_journal_la_SOURCES += \ @@ -2238,6 +2411,14 @@ libsystemd_journal_la_CFLAGS += \ libsystemd_journal_la_LIBADD += \ $(XZ_LIBS) + +libsystemd_journal_internal_la_CFLAGS = \ + $(AM_CFLAGS) + $(XZ_CFLAGS) + +libsystemd_journal_internal_la_LIBADD = \ + $(XZ_LIBS) + endif # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed @@ -2261,7 +2442,14 @@ UNINSTALL_EXEC_HOOKS += \ noinst_PROGRAMS += \ test-journal \ - test-journal-send + test-journal-send \ + test-journal-match \ + test-journal-stream + +TESTS += \ + test-journal \ + test-journal-match \ + test-journal-stream pkginclude_HEADERS += \ src/systemd/sd-journal.h \ @@ -2270,6 +2458,9 @@ pkginclude_HEADERS += \ lib_LTLIBRARIES += \ libsystemd-journal.la +noinst_LTLIBRARIES += \ + libsystemd-journal-internal.la + rootlibexec_PROGRAMS += \ systemd-journald @@ -2283,7 +2474,8 @@ 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 @@ -2309,6 +2501,7 @@ 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 += \ @@ -2320,13 +2513,13 @@ systemd_coredump_SOURCES = \ src/journal/coredump.c systemd_coredump_LDADD = \ - libsystemd-journal.la \ + libsystemd-journal-internal.la \ libsystemd-label.la \ libsystemd-shared.la if ENABLE_LOGIND systemd_coredump_LDADD += \ - libsystemd-login.la + libsystemd-login-internal.la endif rootlibexec_PROGRAMS += \ @@ -2439,7 +2632,8 @@ systemd_readahead_LDADD = \ libsystemd-daemon.la \ libudev.la -pkginclude_HEADERS += \ +dist_doc_DATA += \ + src/readahead/sd-readahead.c \ src/systemd/sd-readahead.h rootlibexec_PROGRAMS += \ @@ -2461,7 +2655,7 @@ EXTRA_DIST += \ MANPAGES += \ man/sd_readahead.3 \ - man/sd-readahead.7 \ + man/sd-readahead.3 \ man/systemd-readahead-replay.service.8 MANPAGES_ALIAS += \ @@ -2493,6 +2687,15 @@ systemd_quotacheck_SOURCES = \ 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 # ------------------------------------------------------------------------------ @@ -2581,6 +2784,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 # ------------------------------------------------------------------------------ @@ -2697,7 +2911,7 @@ man/systemd-localed.8: man/systemd-localed.service.8 EXTRA_DIST += \ units/systemd-localed.service.in -dist_pkgdata_DATA = \ +dist_pkgdata_DATA += \ src/locale/kbd-model-map dist_noinst_SCRIPT = \ @@ -2855,7 +3069,7 @@ test_login_SOURCES = \ src/login/test-login.c test_login_LDADD = \ - libsystemd-login.la \ + libsystemd-login-internal.la \ libsystemd-shared.la test_inhibit_SOURCES = \ @@ -2889,6 +3103,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 @@ -2956,6 +3173,9 @@ pkginclude_HEADERS += \ lib_LTLIBRARIES += \ libsystemd-login.la +noinst_LTLIBRARIES += \ + libsystemd-login-internal.la + pkgconfiglib_DATA += \ src/login/libsystemd-login.pc @@ -2999,7 +3219,7 @@ nodist_udevrules_DATA += \ 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 \ @@ -3014,6 +3234,7 @@ 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 \ @@ -3035,6 +3256,7 @@ 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 @@ -3160,7 +3382,10 @@ if HAVE_XSLTPROC XSLTPROC_FLAGS = \ --nonet \ --stringparam man.output.quietly 1 \ - --stringparam funcsynopsis.style ansi + --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 $@) && \ @@ -3321,29 +3546,12 @@ 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 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 ( 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 @@ -3352,9 +3560,6 @@ if TARGET_MANDRIVA $(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 @@ -3374,9 +3579,6 @@ if TARGET_MAGEIA 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 ) endif install-exec-hook: $(INSTALL_EXEC_HOOKS)