chiark / gitweb /
Revert "build-sys: move journalctl CFLAGS= to one line"
authorColin Walters <walters@verbum.org>
Sun, 20 Oct 2013 13:53:05 +0000 (09:53 -0400)
committerColin Walters <walters@verbum.org>
Sun, 20 Oct 2013 13:53:05 +0000 (09:53 -0400)
This reverts commit e5d5aa1d0f4e143f12f5e00ca072547369d37e53; it
breaks if !HAVE_QRENCODE since then we aren't using $(AM_CFLAGS) for
journalctl.

Makefile.am

index 91eb154..a29a32a 100644 (file)
@@ -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 += \