From: Colin Walters <walters@verbum.org>
Date: Sun, 20 Oct 2013 13:53:05 +0000 (-0400)
Subject: Revert "build-sys: move journalctl CFLAGS= to one line"
X-Git-Tag: v209~1814
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a54156a297a01931f6bade76376eb7a9cb776ccc

Revert "build-sys: move journalctl CFLAGS= to one line"

This reverts commit e5d5aa1d0f4e143f12f5e00ca072547369d37e53; it
breaks if !HAVE_QRENCODE since then we aren't using $(AM_CFLAGS) for
journalctl.
---

diff --git a/Makefile.am b/Makefile.am
index 91eb1541f..a29a32a5d 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,8 +2810,7 @@ journalctl_SOURCES += \
 	src/journal/journal-qrcode.c \
 	src/journal/journal-qrcode.h
 
-journalctl_CFLAGS = \
-	$(AM_CFLAGS) \
+journalctl_CFLAGS += \
 	$(QRENCODE_CFLAGS)
 
 journalctl_LDADD += \