journal: add new system-cat tool as kind of a more powerfull BSD logger

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f5cef3f89a8ed0b7c9bcdf688b2d5e1f7437f1b9..d94de56ff1d27d664e31f9f003c97c87940af59d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -974,6 +974,7 @@ systemctl_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
        libsystemd-journal.la \
+       libsystemd-id128.la \
        $(DBUS_LIBS)
 
 systemd_notify_SOURCES = \
@@ -1207,9 +1208,13 @@ systemd_journald_SOURCES = \
        src/journal/lookup3.c \
        src/journal/journal-rate-limit.c \
        src/sd-id128.c \
-       src/acl-util.c \
        src/cgroup-util.c
 
+if HAVE_ACL
+systemd_journald_SOURCES += \
+       src/acl-util.c
+endif
+
 nodist_systemd_journald_SOURCES = \
        src/journal/journald-gperf.c
 
@@ -1232,6 +1237,13 @@ systemd_journald_LDADD += \
        $(XZ_LIBS)
 endif
 
+systemd_cat_SOURCES = \
+        src/journal/cat.c
+
+systemd_cat_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-journal.la
+
 systemd_journalctl_SOURCES = \
        src/journal/journalctl.c \
        src/pager.c \
@@ -1239,7 +1251,8 @@ systemd_journalctl_SOURCES = \
 
 systemd_journalctl_LDADD = \
        libsystemd-basic.la \
-       libsystemd-journal.la
+       libsystemd-journal.la \
+       libsystemd-id128.la
 
 if HAVE_XZ
 systemd_journalctl_SOURCES += \
@@ -1339,6 +1352,9 @@ rootlibexec_PROGRAMS += \
 rootbin_PROGRAMS += \
        systemd-journalctl
 
+bin_PROGRAMS += \
+        systemd-cat
+
 dist_systemunit_DATA += \
        units/systemd-journald.socket
 
@@ -2440,8 +2456,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-rootprefix=$$dc_install_base/$(rootprefix)
 
 upload: all distcheck
-       cp -v systemd-$(VERSION).tar.bz2 /home/lennart/git.fedora/systemd/
-       scp systemd-$(VERSION).tar.bz2 fdo:/srv/www.freedesktop.org/www/software/systemd/
+       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 tango:public/systemd-man/
 
 git-tag: