diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-01-04 19:36:45 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-01-04 19:36:45 +0100 |
| commit | 96d1efbabeecef9a7e079e5b92d9ee04619cfa65 (patch) | |
| tree | c692384e3e01f08e23b0a575abff5d12d1580e6f /Makefile.am | |
| parent | 8df5c320a502786834a715eb30dc763ad74670e8 (diff) | |
journal: fix XZ build flags
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index b778b1a2c6..7962db032f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1203,6 +1203,7 @@ if HAVE_XZ systemd_journalctl_SOURCES += \ src/journal/compress.c systemd_journalctl_CFLAGS = \ + $(AM_CFLAGS) \ $(XZ_CFLAGS) systemd_journalctl_LDADD += \ $(XZ_LIBS) @@ -1224,6 +1225,7 @@ test_journal_SOURCES += \ src/journal/compress.c test_journal_CFLAGS = \ + $(AM_CFLAGS) \ $(XZ_CFLAGS) test_journal_LDADD += \ @@ -1233,13 +1235,11 @@ endif libsystemd_journal_la_SOURCES = \ src/journal/sd-journal.c \ src/journal/journal-file.c \ - src/journal/compress.c \ src/journal/lookup3.c \ src/journal/journal-send.c libsystemd_journal_la_CFLAGS = \ $(AM_CFLAGS) \ - $(XZ_CFLAGS) \ -fvisibility=hidden libsystemd_journal_la_LDFLAGS = \ @@ -1249,8 +1249,18 @@ libsystemd_journal_la_LDFLAGS = \ libsystemd_journal_la_LIBADD = \ libsystemd-basic.la \ - libsystemd-id128.la \ + libsystemd-id128.la + +if HAVE_XZ +libsystemd_journal_la_SOURCES += \ + src/journal/compress.c + +libsystemd_journal_la_CFLAGS += \ + $(XZ_CFLAGS) + +libsystemd_journal_la_LIBADD += \ $(XZ_LIBS) +endif # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libsystemd-journal-install-hook: |