From 7b997776df38e196b4a779ee4e6be3acd0a363e2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 26 Oct 2016 22:12:48 -0400 Subject: pre-merge --- src/Makefile | 1 - src/grp-journal/grp-remote/Makefile | 1 + src/grp-journal/grp-remote/libsystemd-microhttpd/Makefile | 2 +- src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile | 2 +- src/grp-system/libcore/src/load-fragment-gperf.gperf.m4 | 3 +-- 5 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/Makefile b/src/Makefile index 23363fd543..cb104f7fdb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -42,7 +42,6 @@ nested.subdirs += libsystemd nested.subdirs += libsystemd-basic nested.subdirs += libsystemd-firewall nested.subdirs += libsystemd-gcrypt -nested.subdirs += libsystemd-microhttpd nested.subdirs += libsystemd-network nested.subdirs += libsystemd-shared nested.subdirs += libudev diff --git a/src/grp-journal/grp-remote/Makefile b/src/grp-journal/grp-remote/Makefile index 66e419a37e..d1ef4329db 100644 --- a/src/grp-journal/grp-remote/Makefile +++ b/src/grp-journal/grp-remote/Makefile @@ -23,6 +23,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk +nested.subdirs += libsystemd-microhttpd nested.subdirs += systemd-journal-gatewayd nested.subdirs += systemd-journal-remote nested.subdirs += systemd-journal-upload diff --git a/src/grp-journal/grp-remote/libsystemd-microhttpd/Makefile b/src/grp-journal/grp-remote/libsystemd-microhttpd/Makefile index 15370638f2..4a9896ee1c 100644 --- a/src/grp-journal/grp-remote/libsystemd-microhttpd/Makefile +++ b/src/grp-journal/grp-remote/libsystemd-microhttpd/Makefile @@ -20,7 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see . -include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk nested.subdirs += src diff --git a/src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile b/src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile index f3552b2e9a..7df638b778 100644 --- a/src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile +++ b/src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile @@ -20,7 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see . -include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk ifneq ($(HAVE_MICROHTTPD),) diff --git a/src/grp-system/libcore/src/load-fragment-gperf.gperf.m4 b/src/grp-system/libcore/src/load-fragment-gperf.gperf.m4 index 9a99f3453d..4658fe71b8 100644 --- a/src/grp-system/libcore/src/load-fragment-gperf.gperf.m4 +++ b/src/grp-system/libcore/src/load-fragment-gperf.gperf.m4 @@ -1,10 +1,9 @@ %{ #include +#include "core/load-fragment.h" #include "systemd-basic/missing.h" #include "systemd-shared/conf-parser.h" - -#include "core/load-fragment.h" %} struct ConfigPerfItem; %null_strings -- cgit v1.2.3-54-g00ecf