diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-11-12 17:29:07 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-11-14 23:39:53 +0100 |
| commit | d025f1e4dca8fc1436aff76f9e6185fe3e728daa (patch) | |
| tree | 7cddcd1bfeebe2f8e7bbac0ac249755aa91789e6 /src/journal/journald-console.c | |
| parent | be1015dd347edd9d72eebb444c88dddf92383c18 (diff) | |
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.
Diffstat (limited to 'src/journal/journald-console.c')
| -rw-r--r-- | src/journal/journald-console.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c index 2596d44705..be55f94878 100644 --- a/src/journal/journald-console.c +++ b/src/journal/journald-console.c @@ -23,7 +23,7 @@ #include <unistd.h> #include <sys/socket.h> -#include "journald.h" +#include "journald-server.h" #include "journald-console.h" void server_forward_console( |