diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-15 01:56:36 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-15 01:56:36 -0400 |
commit | be6cdcb499515a8dc200440f9c0f95d16edbaa2d (patch) | |
tree | 9b7626a8a5341707648aa97f173954d0e94ca8d4 /src/grp-journal/grp-remote | |
parent | 3e439de4e3773f26c7efc8d84a57cf2530883739 (diff) | |
parent | ca23ffae30b2cd8e2ac7f54f77a6ff8c59e3876f (diff) |
Merge branch 'notsystemd/postmove' into notsystemd/master
# Conflicts:
# build-aux/Makefile.each.tail/50-sd.mk
# build-aux/Makefile.each.tail/70-man.mk
# src/grp-resolve/libbasic-dns/Makefile
# src/grp-system/libcore/Makefile
# tools/notsd-move
Diffstat (limited to 'src/grp-journal/grp-remote')
3 files changed, 0 insertions, 4 deletions
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 = \ |