From: Colin Walters <walters@verbum.org>
Date: Fri, 18 Oct 2013 14:13:52 +0000 (-0400)
Subject: build-sys: Honor CFLAGS for journalctl again
X-Git-Tag: v209~1836
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=4ca302b967415107bf7c8f3deb0e3837ac2e2b9f

build-sys: Honor CFLAGS for journalctl again

Regression from e905a456814eadfb904c49241e3841c1e4a1d119.
---

diff --git a/Makefile.am b/Makefile.am
index 196efe10b..ca01179e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 += \