]> git.ipfire.org Git - thirdparty/systemd.git/commit - Makefile.am
build-sys: store journald code in a noinst library
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 12 Nov 2012 16:29:07 +0000 (17:29 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 14 Nov 2012 22:39:53 +0000 (23:39 +0100)
commitd025f1e4dca8fc1436aff76f9e6185fe3e728daa
tree7cddcd1bfeebe2f8e7bbac0ac249755aa91789e6
parentbe1015dd347edd9d72eebb444c88dddf92383c18
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.
15 files changed:
Makefile.am
src/journal/journald-console.c
src/journal/journald-console.h
src/journal/journald-gperf.gperf
src/journal/journald-kmsg.c
src/journal/journald-kmsg.h
src/journal/journald-native.c
src/journal/journald-native.h
src/journal/journald-server.c [new file with mode: 0644]
src/journal/journald-server.h [moved from src/journal/journald.h with 90% similarity]
src/journal/journald-stream.c
src/journal/journald-stream.h
src/journal/journald-syslog.c
src/journal/journald-syslog.h
src/journal/journald.c