diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-26 22:12:48 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-26 22:12:48 -0400 |
| commit | 7b997776df38e196b4a779ee4e6be3acd0a363e2 (patch) | |
| tree | 2706dcdeaa1c3a1e6cb7b343e54aa0da69caf61c /src/grp-journal | |
| parent | 85cd5a4268172ce57b94f5aa097263f6e1939c64 (diff) | |
pre-merge
Diffstat (limited to 'src/grp-journal')
| -rw-r--r-- | src/grp-journal/grp-remote/Makefile | 1 | ||||
| -rw-r--r-- | src/grp-journal/grp-remote/libsystemd-microhttpd/Makefile | 2 | ||||
| -rw-r--r-- | src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile | 2 |
3 files changed, 3 insertions, 2 deletions
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 <http://www.gnu.org/licenses/>. -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 <http://www.gnu.org/licenses/>. -include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk ifneq ($(HAVE_MICROHTTPD),) |