build-sys: Honor CFLAGS for journalctl again

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 05f6f9029129bf995c0f80a9b8a124071c8aecfb..ca01179e82e0e3b360eabfe9363241ea79594807 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1490,7 +1490,7 @@ systemd_update_utmp_CFLAGS = \
 
 systemd_update_utmp_LDADD = \
        libsystemd-shared.la \
-       libsystemd-dbus.la \
+       libsystemd-bus.la \
        $(AUDIT_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -2789,6 +2789,8 @@ systemd_cat_LDADD = \
        libsystemd-shared.la \
        libsystemd-journal-internal.la
 
+journalctl_CFLAGS = $(AM_CFLAGS)
+
 journalctl_SOURCES = \
        src/journal/journalctl.c
 
@@ -2808,7 +2810,7 @@ journalctl_SOURCES += \
        src/journal/journal-qrcode.c \
        src/journal/journal-qrcode.h
 
-journalctl_CFLAGS = \
+journalctl_CFLAGS += \
        $(QRENCODE_CFLAGS)
 
 journalctl_LDADD += \
@@ -2995,7 +2997,7 @@ libsystemd_journal_la_CFLAGS += \
 libsystemd_journal_la_LIBADD += \
        $(XZ_LIBS)
 
-libsystemd_journal_internal_la_CFLAGS = \
+libsystemd_journal_internal_la_CFLAGS += \
        $(XZ_CFLAGS)
 
 libsystemd_journal_internal_la_LIBADD += \