chiark / gitweb /
man: document sd_journal_get_cursor()
[elogind.git] / Makefile.am
index 1cfbf40..50b2a9f 100644 (file)
@@ -133,7 +133,6 @@ AM_CPPFLAGS = \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
        -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
        -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
-       -DSYSTEMD_NTP_UNITS=\"$(pkgdatadir)/ntp-units\" \
        -DX_SERVER=\"$(bindir)/X\" \
        -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
@@ -174,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\" \
@@ -202,7 +195,6 @@ endif
 endif
 endif
 endif
-endif
 
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS = \
@@ -502,7 +494,19 @@ MANPAGES = \
        man/systemd-getty-generator.8 \
        man/systemd-system-update-generator.8 \
        man/systemd-fstab-generator.8 \
-       man/systemd.preset.5
+       man/systemd.preset.5 \
+       man/sd-id128.3 \
+       man/sd_id128_to_string.3 \
+       man/sd_id128_randomize.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
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
@@ -531,7 +535,30 @@ MANPAGES_ALIAS = \
        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/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_machine.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_open_directory.3 \
+       man/sd_journal_close.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/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
@@ -560,6 +587,29 @@ 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_machine.3: man/sd_id128_randomize.3
+man/sd_id128_get_boot.3: man/sd_id128_randomize.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_open_directory.3: man/sd_journal_open.3
+man/sd_journal_close.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
 
 XML_FILES = \
        ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -706,8 +756,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 += \
@@ -856,7 +907,9 @@ 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
 
 nodist_libsystemd_core_la_SOURCES = \
        src/core/load-fragment-gperf.c \
@@ -906,7 +959,7 @@ systemd_CFLAGS = \
 systemd_LDADD = \
        libsystemd-core.la \
        libsystemd-daemon.la \
-       libsystemd-id128.la \
+       libsystemd-id128-internal.la \
        libsystemd-dbus.la
 
 dist_pkgsysconf_DATA += \
@@ -973,7 +1026,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
@@ -1112,7 +1166,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 \
@@ -1148,7 +1204,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 = \
@@ -1273,8 +1329,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
 
@@ -1389,7 +1445,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 \
@@ -2095,12 +2151,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
@@ -2114,6 +2173,9 @@ pkginclude_HEADERS += \
 lib_LTLIBRARIES += \
        libsystemd-id128.la
 
+noinst_LTLIBRARIES += \
+       libsystemd-id128-internal.la
+
 pkgconfiglib_DATA += \
        src/libsystemd-id128/libsystemd-id128.pc
 
@@ -2166,11 +2228,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
@@ -2195,47 +2257,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 \
@@ -2255,7 +2318,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 += \
@@ -2267,6 +2333,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
@@ -2290,7 +2364,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 \
@@ -2299,6 +2380,9 @@ pkginclude_HEADERS += \
 lib_LTLIBRARIES += \
        libsystemd-journal.la
 
+noinst_LTLIBRARIES += \
+       libsystemd-journal-internal.la
+
 rootlibexec_PROGRAMS += \
        systemd-journald
 
@@ -2312,7 +2396,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
@@ -2338,6 +2423,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 += \
@@ -2349,13 +2435,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 += \
@@ -2490,7 +2576,7 @@ EXTRA_DIST += \
 
 MANPAGES += \
        man/sd_readahead.3 \
-       man/sd-readahead.7 \
+       man/sd-readahead.3 \
        man/systemd-readahead-replay.service.8
 
 MANPAGES_ALIAS += \
@@ -2802,9 +2888,6 @@ timedated-install-data-hook:
 INSTALL_DATA_HOOKS += \
        timedated-install-data-hook
 
-dist_pkgdata_DATA += \
-       src/timedate/ntp-units
-
 MANPAGES += \
        man/systemd-timedated.service.8
 
@@ -2907,7 +2990,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 = \
@@ -2941,6 +3024,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
@@ -3008,6 +3094,9 @@ pkginclude_HEADERS += \
 lib_LTLIBRARIES += \
        libsystemd-login.la
 
+noinst_LTLIBRARIES += \
+       libsystemd-login-internal.la
+
 pkgconfiglib_DATA += \
        src/login/libsystemd-login.pc
 
@@ -3051,7 +3140,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 \
@@ -3373,20 +3462,6 @@ 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) && \