From d025f1e4dca8fc1436aff76f9e6185fe3e728daa Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mon, 12 Nov 2012 17:29:07 +0100 Subject: build-sys: store journald code in a noinst library The point is to allow the use of journald functions by other binaries. Before, journald code was split into multiple files (journald-*.[ch]), but all those files all required functions from journald.c. And journald.c has its own main(). Now, it is possible to link against those functions, e.g. from test binaries. This constitutes a fix for https://bugzilla.redhat.com/show_bug.cgi?id=872638. The patch does the following: 1. rename journald.h to journald-server.h and move corresponding code to journald-server.c. 2. add journald-server.c and other journald-*.c parts to libsystemd-journal-internal. 3. remove journald-syslog.c from test_journal_syslog_SOURCES, since it is now contained in libsystemd-journal-internal. There are no code changes, apart from the removal of a few static's, to allow function calls between files. --- src/journal/journald-kmsg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/journal/journald-kmsg.h') diff --git a/src/journal/journald-kmsg.h b/src/journal/journald-kmsg.h index 0ebbaff752..f287161329 100644 --- a/src/journal/journald-kmsg.h +++ b/src/journal/journald-kmsg.h @@ -21,7 +21,7 @@ along with systemd; If not, see . ***/ -#include "journald.h" +#include "journald-server.h" int server_open_dev_kmsg(Server *s); int server_read_dev_kmsg(Server *s); -- cgit v1.2.3-54-g00ecf