chiark / gitweb /
build-sys: Honor CFLAGS for journalctl again
authorColin Walters <walters@verbum.org>
Fri, 18 Oct 2013 14:13:52 +0000 (10:13 -0400)
committerColin Walters <walters@verbum.org>
Fri, 18 Oct 2013 14:13:52 +0000 (10:13 -0400)
Regression from e905a456814eadfb904c49241e3841c1e4a1d119.

Makefile.am

index 196efe10b87fad9d5951099d478addeab0ab805c..ca01179e82e0e3b360eabfe9363241ea79594807 100644 (file)
@@ -2789,6 +2789,8 @@ systemd_cat_LDADD = \
        libsystemd-shared.la \
        libsystemd-journal-internal.la
 
        libsystemd-shared.la \
        libsystemd-journal-internal.la
 
+journalctl_CFLAGS = $(AM_CFLAGS)
+
 journalctl_SOURCES = \
        src/journal/journalctl.c
 
 journalctl_SOURCES = \
        src/journal/journalctl.c
 
@@ -2808,7 +2810,7 @@ journalctl_SOURCES += \
        src/journal/journal-qrcode.c \
        src/journal/journal-qrcode.h
 
        src/journal/journal-qrcode.c \
        src/journal/journal-qrcode.h
 
-journalctl_CFLAGS = \
+journalctl_CFLAGS += \
        $(QRENCODE_CFLAGS)
 
 journalctl_LDADD += \
        $(QRENCODE_CFLAGS)
 
 journalctl_LDADD += \