diff options
| author | Colin Walters <walters@verbum.org> | 2013-10-20 09:53:05 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2013-10-20 09:53:05 -0400 |
| commit | a54156a297a01931f6bade76376eb7a9cb776ccc (patch) | |
| tree | 9fa110554c8704addb50c01cf365cf5a47782b52 | |
| parent | 3396c37f91a1a62d65b9dc5251246678a5cd381f (diff) | |
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.
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 91eb1541fe..a29a32a5d2 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 += \ |