summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am76
1 files changed, 69 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index d30d626ebf..58b3a63517 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -141,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 \
@@ -180,7 +181,8 @@ rootlibexec_PROGRAMS = \
systemd-detect-virt \
systemd-sysctl \
systemd-logind \
- systemd-uaccess
+ systemd-uaccess \
+ systemd-journald
if ENABLE_BINFMT
rootlibexec_PROGRAMS += \
@@ -232,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 = \
@@ -701,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 \
@@ -963,6 +968,60 @@ 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/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
@@ -1107,10 +1166,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 = \
@@ -1158,7 +1219,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)