journal: add native protocol to journald, and client side API to send journal messages

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 66a64fd4faded31e55114159329c40d424b97baa..7dee4cf0a4a0deacf65caf7a513b7494207aed3c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = po
 
 LIBSYSTEMD_LOGIN_CURRENT=0
-LIBSYSTEMD_LOGIN_REVISION=5
+LIBSYSTEMD_LOGIN_REVISION=6
 LIBSYSTEMD_LOGIN_AGE=0
 
 LIBSYSTEMD_DAEMON_CURRENT=0
@@ -76,6 +76,7 @@ AM_CPPFLAGS = \
        -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
        -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+        -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
        -I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -118,6 +119,13 @@ AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
        -DKBD_SETFONT=\"/bin/setfont\" \
        -DDEFAULT_FONT=\"latarcyrheb-sun16\"
+else
+if TARGET_MAGEIA
+AM_CPPFLAGS += \
+       -DKBD_LOADKEYS=\"/bin/loadkeys\" \
+       -DKBD_SETFONT=\"/bin/setfont\" \
+       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+endif
 endif
 endif
 endif
@@ -133,7 +141,8 @@ rootbin_PROGRAMS = \
        systemd-ask-password \
        systemd-tty-ask-password-agent \
        systemd-tmpfiles \
-       systemd-machine-id-setup
+       systemd-machine-id-setup \
+        systemd-journalctl
 
 bin_PROGRAMS = \
        systemd-cgls \
@@ -172,7 +181,8 @@ rootlibexec_PROGRAMS = \
        systemd-detect-virt \
        systemd-sysctl \
         systemd-logind \
-        systemd-uaccess
+        systemd-uaccess \
+        systemd-journald
 
 if ENABLE_BINFMT
 rootlibexec_PROGRAMS += \
@@ -224,7 +234,9 @@ noinst_PROGRAMS = \
        test-env-replace \
        test-strv \
         test-login \
-        test-install
+        test-install \
+        test-id128 \
+        test-journal
 
 if HAVE_PAM
 pamlib_LTLIBRARIES = \
@@ -313,7 +325,7 @@ dbusinterface_DATA += \
 endif
 
 dist_bashcompletion_DATA = \
-       src/systemctl-bash-completion.sh
+       src/systemd-bash-completion.sh
 
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
@@ -336,7 +348,9 @@ dist_systemunit_DATA = \
        units/halt.target \
        units/kexec.target \
        units/local-fs.target \
+        units/local-fs-pre.target \
        units/remote-fs.target \
+        units/remote-fs-pre.target \
        units/cryptsetup.target \
        units/network.target \
        units/nss-lookup.target \
@@ -539,6 +553,13 @@ dist_systemunit_DATA += \
        units/suse/halt-local.service
 endif
 
+if TARGET_MAGEIA
+dist_systemunit_DATA += \
+       units/mageia/prefdm.service \
+       units/fedora/rc-local.service \
+       units/fedora/halt-local.service
+endif
+
 if HAVE_PLYMOUTH
 dist_systemunit_DATA += \
        units/plymouth-start.service \
@@ -684,7 +705,8 @@ libsystemd_core_la_SOURCES = \
         src/dbus-common.c \
         src/sd-daemon.c \
         src/install.c \
-        src/cgroup-attr.c
+        src/cgroup-attr.c \
+        src/sd-id128.c
 
 nodist_libsystemd_core_la_SOURCES = \
         src/load-fragment-gperf.c \
@@ -946,6 +968,61 @@ test_install_CFLAGS = \
 test_install_LDADD = \
        libsystemd-basic.la
 
+test_id128_SOURCES = \
+       src/test-id128.c \
+        src/sd-id128.c
+
+test_id128_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_id128_LDADD = \
+       libsystemd-basic.la
+
+test_journal_SOURCES = \
+       src/journal/test-journal.c \
+       src/journal/sd-journal.c \
+        src/journal/journal-file.c \
+        src/journal/lookup3.c \
+        src/journal/journal-send.c \
+        src/sd-id128.c
+
+test_journal_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_journal_LDADD = \
+       libsystemd-basic.la
+
+systemd_journald_SOURCES = \
+       src/journal/journald.c \
+       src/journal/sd-journal.c \
+        src/journal/journal-file.c \
+        src/journal/lookup3.c \
+        src/sd-id128.c \
+        src/acl-util.c \
+        src/cgroup-util.c
+
+systemd_journald_CFLAGS = \
+       $(AM_CFLAGS) \
+        $(ACL_CFLAGS)
+
+systemd_journald_LDADD = \
+       libsystemd-basic.la \
+        libsystemd-daemon.la \
+        $(ACL_LIBS)
+
+systemd_journalctl_SOURCES = \
+       src/journal/journalctl.c \
+       src/journal/sd-journal.c \
+        src/journal/journal-file.c \
+        src/journal/lookup3.c \
+        src/sd-id128.c
+
+systemd_journalctl_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_journalctl_LDADD = \
+       libsystemd-basic.la
+
 systemd_stdout_syslog_bridge_SOURCES = \
        src/stdout-syslog-bridge.c \
        src/tcpwrap.c
@@ -1031,6 +1108,12 @@ systemd_localed_LDADD = \
        libsystemd-daemon.la \
        $(DBUS_LIBS)
 
+dist_pkgdata_DATA = \
+        src/kbd-model-map
+
+dist_noinst_SCRIPT = \
+        src/generate-kbd-model-map
+
 systemd_timedated_SOURCES = \
        src/timedated.c \
         src/dbus-common.c \
@@ -1084,10 +1167,12 @@ systemd_uaccess_SOURCES = \
 
 if HAVE_ACL
 systemd_logind_SOURCES += \
-       src/logind-acl.c
+       src/logind-acl.c \
+        src/acl-util.c
 
 systemd_uaccess_SOURCES += \
-       src/logind-acl.c
+       src/logind-acl.c \
+        src/acl-util.c
 endif
 
 systemd_uaccess_CFLAGS = \
@@ -1135,7 +1220,8 @@ systemd_tmpfiles_LDADD = \
 
 systemd_machine_id_setup_SOURCES = \
        src/machine-id-setup.c \
-       src/machine-id-main.c
+       src/machine-id-main.c \
+        src/sd-id128.c
 
 systemd_machine_id_setup_CFLAGS = \
        $(AM_CFLAGS)
@@ -1417,7 +1503,8 @@ systemd_stdio_bridge_LDADD = \
 
 systemadm_SOURCES = \
        src/systemadm.vala \
-       src/systemd-interfaces.vala
+       src/systemd-interfaces.vala \
+       src/wraplabel.vala
 
 systemadm_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1430,6 +1517,7 @@ systemadm_CFLAGS = \
 systemadm_VALAFLAGS = \
        --pkg=posix \
        --pkg=gtk+-2.0 \
+       --pkg=gee-1.0 \
        -g
 
 systemadm_LDADD = \
@@ -1990,6 +2078,23 @@ if TARGET_SUSE
                $(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)/multi-user.target.wants && \
+               rm -f rc-local.service && \
+               $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+       ( 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 )
+endif
+
 if HAVE_SYSV_COMPAT
        ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
                rm -f var-lock.mount && \
@@ -2016,3 +2121,6 @@ upload: all distcheck
 
 git-tag:
        git tag "v$(VERSION)" -m "systemd $(VERSION)"
+
+update-kbd-model-map:
+       src/generate-kbd-model-map > src/kbd-model-map