|
 |
771b4bc |
From 63eb5cffa2f47c8169a619279cd7dfbad0499630 Mon Sep 17 00:00:00 2001
|
|
|
771b4bc |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
771b4bc |
Date: Thu, 12 Apr 2012 17:42:09 +0200
|
|
|
771b4bc |
Subject: [PATCH] build-sys: split off logs-show into its own convenience
|
|
|
771b4bc |
library (cherry picked from commit
|
|
|
771b4bc |
41e5171419f5f9c08a338ea8b2ab8ea89c23c4ab)
|
|
|
771b4bc |
|
|
|
771b4bc |
---
|
|
|
771b4bc |
Makefile.am | 31 ++++++++++++++++++-------------
|
|
|
771b4bc |
1 file changed, 18 insertions(+), 13 deletions(-)
|
|
|
771b4bc |
|
|
|
771b4bc |
diff --git a/Makefile.am b/Makefile.am
|
|
|
771b4bc |
index 32a2edf..17069d2 100644
|
|
|
771b4bc |
--- a/Makefile.am
|
|
|
771b4bc |
+++ b/Makefile.am
|
|
|
771b4bc |
@@ -541,8 +541,6 @@ libsystemd_shared_la_SOURCES = \
|
|
|
771b4bc |
src/shared/socket-util.h \
|
|
|
771b4bc |
src/shared/cgroup-util.c \
|
|
|
771b4bc |
src/shared/cgroup-util.h \
|
|
|
771b4bc |
- src/shared/logs-show.c \
|
|
|
771b4bc |
- src/shared/logs-show.h \
|
|
|
771b4bc |
src/shared/cgroup-show.c \
|
|
|
771b4bc |
src/shared/cgroup-show.h \
|
|
|
771b4bc |
src/shared/unit-name.c \
|
|
|
771b4bc |
@@ -615,6 +613,21 @@ libsystemd_label_la_LIBADD = \
|
|
|
771b4bc |
|
|
|
771b4bc |
# ------------------------------------------------------------------------------
|
|
|
771b4bc |
noinst_LTLIBRARIES += \
|
|
|
771b4bc |
+ libsystemd-logs.la
|
|
|
771b4bc |
+
|
|
|
771b4bc |
+libsystemd_logs_la_SOURCES = \
|
|
|
771b4bc |
+ src/shared/logs-show.c \
|
|
|
771b4bc |
+ src/shared/logs-show.h
|
|
|
771b4bc |
+
|
|
|
771b4bc |
+libsystemd_logs_la_CFLAGS = \
|
|
|
771b4bc |
+ $(AM_CFLAGS)
|
|
|
771b4bc |
+
|
|
|
771b4bc |
+libsystemd_logs_la_LIBADD = \
|
|
|
771b4bc |
+ libsystemd-journal.la \
|
|
|
771b4bc |
+ libsystemd-id128.la
|
|
|
771b4bc |
+
|
|
|
771b4bc |
+# ------------------------------------------------------------------------------
|
|
|
771b4bc |
+noinst_LTLIBRARIES += \
|
|
|
771b4bc |
libsystemd-capability.la
|
|
|
771b4bc |
|
|
|
771b4bc |
libsystemd_capability_la_SOURCES = \
|
|
|
771b4bc |
@@ -1112,6 +1125,7 @@ systemctl_LDADD = \
|
|
|
771b4bc |
libsystemd-journal.la \
|
|
|
771b4bc |
libsystemd-id128.la \
|
|
|
771b4bc |
libsystemd-dbus.la \
|
|
|
771b4bc |
+ libsystemd-logs.la
|
|
|
771b4bc |
$(DBUS_LIBS)
|
|
|
771b4bc |
|
|
|
771b4bc |
# ------------------------------------------------------------------------------
|
|
|
771b4bc |
@@ -1408,17 +1422,8 @@ journalctl_SOURCES = \
|
|
|
771b4bc |
journalctl_LDADD = \
|
|
|
771b4bc |
libsystemd-shared.la \
|
|
|
771b4bc |
libsystemd-journal.la \
|
|
|
771b4bc |
- libsystemd-id128.la
|
|
|
771b4bc |
-
|
|
|
771b4bc |
-if HAVE_XZ
|
|
|
771b4bc |
-journalctl_SOURCES += \
|
|
|
771b4bc |
- src/journal/compress.c
|
|
|
771b4bc |
-journalctl_CFLAGS = \
|
|
|
771b4bc |
- $(AM_CFLAGS) \
|
|
|
771b4bc |
- $(XZ_CFLAGS)
|
|
|
771b4bc |
-journalctl_LDADD += \
|
|
|
771b4bc |
- $(XZ_LIBS)
|
|
|
771b4bc |
-endif
|
|
|
771b4bc |
+ libsystemd-id128.la \
|
|
|
771b4bc |
+ libsystemd-logs.la
|
|
|
771b4bc |
|
|
|
771b4bc |
test_journal_SOURCES = \
|
|
|
771b4bc |
src/journal/test-journal.c \
|