diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile | 1 | ||||
| -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 | ||||
| -rw-r--r-- | src/grp-system/libcore/src/load-fragment-gperf.gperf.m4 | 3 |
7 files changed, 5 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index ad74254993..20310a6f14 100644 --- a/.gitignore +++ b/.gitignore @@ -29,7 +29,6 @@ !/build-aux/Makefile* !/build-aux/write-atomic !/build-aux/write-ifchanged -!/build-aux/no-builtin-variables.mk /busctl /cdrom_id /collect diff --git a/Makefile.am b/Makefile.am index 1dabbb0819..f8d6d62a6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1420,7 +1420,7 @@ CLEANFILES += \ #@src/libbasic/include/Makefile nested.subdirs += basic -#@src/libbasic/include/basic/Makefile +#@src/libbasic/include/systemd-basic/Makefile src/basic/errno-list.txt: $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@ 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 <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),) 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 <stddef.h> +#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 |