chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
core: Refuse to run a user instance when the system hasn't been booted with systemd.
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 5da132c6498fc363af9139082eb8e4f9e97753d7..e714b6e10ed10139ffc9aa78f84e48f18f7ce8d3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ SUBDIRS = . po
 .DELETE_ON_ERROR:
 
 LIBUDEV_CURRENT=2
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=5
 LIBUDEV_AGE=1
 
 LIBGUDEV_CURRENT=1
@@ -35,20 +35,20 @@ LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=3
+LIBSYSTEMD_LOGIN_REVISION=8
 LIBSYSTEMD_LOGIN_AGE=3
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=4
+LIBSYSTEMD_DAEMON_REVISION=5
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=9
+LIBSYSTEMD_ID128_REVISION=14
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=4
-LIBSYSTEMD_JOURNAL_REVISION=1
-LIBSYSTEMD_JOURNAL_AGE=4
+LIBSYSTEMD_JOURNAL_CURRENT=5
+LIBSYSTEMD_JOURNAL_REVISION=4
+LIBSYSTEMD_JOURNAL_AGE=5
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -160,43 +160,36 @@ 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\"
+       -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\"
+       -DKBD_SETFONT=\"/bin/setfont\"
 endif
 endif
 endif
@@ -587,7 +580,8 @@ MANPAGES_ALIAS = \
        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_seek_cursor.3 \
+       man/sd_journal_test_cursor.3
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
@@ -656,6 +650,7 @@ 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
 
 XML_FILES = \
        ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -829,6 +824,8 @@ libsystemd_label_la_SOURCES = \
        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 \
@@ -1018,7 +1015,9 @@ libsystemd_core_la_SOURCES = \
        src/core/killall.h \
        src/core/killall.c \
        src/core/syscall-list.c \
-       src/core/syscall-list.h
+       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 \
@@ -1158,14 +1157,16 @@ noinst_PROGRAMS += \
        test-watchdog \
        test-unit-name \
        test-log \
-       test-unit-file
+       test-unit-file \
+       test-date
 
 TESTS += \
        test-job-type \
        test-env-replace \
        test-strv \
        test-unit-name \
-       test-unit-file
+       test-unit-file \
+       test-date
 
 test_engine_SOURCES = \
        src/test/test-engine.c
@@ -1227,6 +1228,12 @@ test_log_SOURCES = \
 test_log_LDADD = \
        libsystemd-core.la
 
+test_date_SOURCES = \
+       src/test/test-date.c
+
+test_date_LDADD = \
+       libsystemd-core.la
+
 test_daemon_SOURCES = \
        src/test/test-daemon.c
 
@@ -1406,6 +1413,12 @@ systemd_detect_virt_SOURCES = \
 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
@@ -2449,6 +2462,15 @@ test_journal_send_LDADD = \
        libsystemd-journal-internal.la \
        libsystemd-id128-internal.la
 
+test_journal_syslog_SOURCES = \
+       src/journal/test-journal-syslog.c \
+       src/journal/journald-syslog.c
+
+test_journal_syslog_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la
+
 test_journal_match_SOURCES = \
        src/journal/test-journal-match.c
 
@@ -2473,6 +2495,13 @@ test_journal_verify_LDADD = \
        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
+
 libsystemd_journal_la_SOURCES = \
        src/journal/sd-journal.c \
        src/systemd/sd-journal.h \
@@ -2575,15 +2604,20 @@ UNINSTALL_EXEC_HOOKS += \
 noinst_PROGRAMS += \
        test-journal \
        test-journal-send \
+       test-journal-syslog \
        test-journal-match \
        test-journal-stream \
-       test-journal-verify
+       test-journal-verify \
+       test-mmap-cache
 
 TESTS += \
        test-journal \
+       test-journal-send \
+       test-journal-syslog \
        test-journal-match \
        test-journal-stream \
-       test-journal-verify
+       test-journal-verify \
+       test-mmap-cache
 
 pkginclude_HEADERS += \
        src/systemd/sd-journal.h \
@@ -2642,6 +2676,43 @@ EXTRA_DIST += \
 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 = \
@@ -3352,8 +3423,7 @@ 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
Unnamed repository; edit this file 'description' to name the repository.