summaryrefslogtreecommitdiff
path: root/src/grp-journal
diff options
context:
space:
mode:
Diffstat (limited to 'src/grp-journal')
-rw-r--r--src/grp-journal/Makefile1
-rw-r--r--src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile2
-rw-r--r--src/grp-journal/grp-remote/systemd-journal-remote/Makefile1
-rw-r--r--src/grp-journal/grp-remote/systemd-journal-upload/Makefile1
-rw-r--r--src/grp-journal/journalctl/Makefile1
5 files changed, 0 insertions, 6 deletions
diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile
index d0b2bf1917..acd4b7a0a1 100644
--- a/src/grp-journal/Makefile
+++ b/src/grp-journal/Makefile
@@ -93,7 +93,6 @@ test_catalog_SOURCES = \
src/journal/test-catalog.c
test_catalog_CPPFLAGS = \
- $(AM_CPPFLAGS) \
-DCATALOG_DIR=\"$(abs_top_builddir)/catalog\"
test_catalog_LDADD = \
diff --git a/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile
index 289228fb71..1daedbd8dd 100644
--- a/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile
@@ -44,11 +44,9 @@ systemd_journal_gatewayd_LDADD += \
endif # HAVE_GNUTLS
systemd_journal_gatewayd_CFLAGS = \
- $(AM_CFLAGS) \
$(MICROHTTPD_CFLAGS)
systemd_journal_gatewayd_CPPFLAGS = \
- $(AM_CPPFLAGS) \
-DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\"
dist_systemunit_DATA += \
diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/Makefile b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
index 45ed4abb63..ebfa101c97 100644
--- a/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
@@ -43,7 +43,6 @@ systemd_journal_remote_SOURCES += \
src/journal-remote/microhttpd-util.c
systemd_journal_remote_CFLAGS = \
- $(AM_CFLAGS) \
$(MICROHTTPD_CFLAGS)
systemd_journal_remote_LDADD += \
diff --git a/src/grp-journal/grp-remote/systemd-journal-upload/Makefile b/src/grp-journal/grp-remote/systemd-journal-upload/Makefile
index c2d1f42cc9..acfcbd22df 100644
--- a/src/grp-journal/grp-remote/systemd-journal-upload/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-upload/Makefile
@@ -33,7 +33,6 @@ systemd_journal_upload_SOURCES = \
src/journal-remote/journal-upload-journal.c
systemd_journal_upload_CFLAGS = \
- $(AM_CFLAGS) \
$(LIBCURL_CFLAGS)
systemd_journal_upload_LDADD = \
diff --git a/src/grp-journal/journalctl/Makefile b/src/grp-journal/journalctl/Makefile
index bf5a4d3924..11cfe17107 100644
--- a/src/grp-journal/journalctl/Makefile
+++ b/src/grp-journal/journalctl/Makefile
@@ -25,7 +25,6 @@ include $(topsrcdir)/build-aux/Makefile.head.mk
# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
journalctl_CFLAGS = \
- $(AM_CFLAGS)
journalctl_SOURCES = \
src/journal/journalctl.c