chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8ef58b3
)
build-sys: split off logs-show into its own convenience library
author
Lennart Poettering
<lennart@poettering.net>
Thu, 12 Apr 2012 15:42:09 +0000
(17:42 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 12 Apr 2012 15:42:09 +0000
(17:42 +0200)
Makefile.am
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index 813ced272e511d38c79f9f1b211bbd8c5e35342c..61891d47a5cdb4452cf76efeb496ffe9d9f07477 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-554,8
+554,6
@@
libsystemd_shared_la_SOURCES = \
src/shared/socket-util.h \
src/shared/cgroup-util.c \
src/shared/cgroup-util.h \
src/shared/socket-util.h \
src/shared/cgroup-util.c \
src/shared/cgroup-util.h \
- src/shared/logs-show.c \
- src/shared/logs-show.h \
src/shared/cgroup-show.c \
src/shared/cgroup-show.h \
src/shared/unit-name.c \
src/shared/cgroup-show.c \
src/shared/cgroup-show.h \
src/shared/unit-name.c \
@@
-626,6
+624,21
@@
libsystemd_label_la_CFLAGS = \
libsystemd_label_la_LIBADD = \
$(SELINUX_LIBS)
libsystemd_label_la_LIBADD = \
$(SELINUX_LIBS)
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+ libsystemd-logs.la
+
+libsystemd_logs_la_SOURCES = \
+ src/shared/logs-show.c \
+ src/shared/logs-show.h
+
+libsystemd_logs_la_CFLAGS = \
+ $(AM_CFLAGS)
+
+libsystemd_logs_la_LIBADD = \
+ libsystemd-journal.la \
+ libsystemd-id128.la
+
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
libsystemd-capability.la
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
libsystemd-capability.la
@@
-1114,6
+1127,7
@@
systemctl_LDADD = \
libsystemd-journal.la \
libsystemd-id128.la \
libsystemd-dbus.la \
libsystemd-journal.la \
libsystemd-id128.la \
libsystemd-dbus.la \
+ libsystemd-logs.la
$(DBUS_LIBS)
# ------------------------------------------------------------------------------
$(DBUS_LIBS)
# ------------------------------------------------------------------------------
@@
-1998,17
+2012,8
@@
journalctl_SOURCES = \
journalctl_LDADD = \
libsystemd-shared.la \
libsystemd-journal.la \
journalctl_LDADD = \
libsystemd-shared.la \
libsystemd-journal.la \
- libsystemd-id128.la
-
-if HAVE_XZ
-journalctl_SOURCES += \
- src/journal/compress.c
-journalctl_CFLAGS = \
- $(AM_CFLAGS) \
- $(XZ_CFLAGS)
-journalctl_LDADD += \
- $(XZ_LIBS)
-endif
+ libsystemd-id128.la \
+ libsystemd-logs.la
test_journal_SOURCES = \
src/journal/test-journal.c \
test_journal_SOURCES = \
src/journal/test-journal.c \