[systemd-commits] Makefile.am

Colin Walters walters at kemper.freedesktop.org
Fri Oct 18 07:14:43 PDT 2013


 Makefile.am |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 4ca302b967415107bf7c8f3deb0e3837ac2e2b9f
Author: Colin Walters <walters at verbum.org>
Date:   Fri Oct 18 10:13:52 2013 -0400

    build-sys: Honor CFLAGS for journalctl again
    
    Regression from e905a456814eadfb904c49241e3841c1e4a1d119.

diff --git a/Makefile.am b/Makefile.am
index 196efe1..ca01179 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 += \



More information about the systemd-commits mailing list