diff options
102 files changed, 215 insertions, 96 deletions
diff --git a/Makefile.am b/Makefile.am index 0e67fd7ef8..c6fa3434c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6546,10 +6546,18 @@ list-keys: add-key: gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --import - +#@src/Makefile + #@src/libudev/Makefile at.subdirs += src #@src/libsystemd/libsystemd-internal/subdir.mk systemd.CPPFLAGS += -DLIBDIR=\"$(libdir)\" systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" +#@src/grp-boot/Makefile +at.subdirs += bootctl systemd-boot +#@src/grp-coredump/Makefile +at.subdirs += coredumpctl systemd-coredump +#@src/grp-machine/Makefile +at.subdirs += machinectl systemd-machined #@all include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/hwdb/Makefile b/hwdb/Makefile index b0cd4ba300..9ffa4ba6a5 100644 --- a/hwdb/Makefile +++ b/hwdb/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 .PHONY: hwdb-update @@ -241,6 +241,9 @@ fixup_makefiles() ( src/libbasic/Makefile \ src/libsystemd/libsystemd-journal-internal/Makefile \ src/udev/Makefile + find -type f -name Makefile|while read -r filename; do + sed -r -i "s|(/\.\.)*/config.mk|$(realpath -ms --relative-to="${filename#%/*}" config.mk)|" "$filename" + done ) move() ( diff --git a/src/Makefile b/src/Makefile new file mode 100644 index 0000000000..b73bfd59e6 --- /dev/null +++ b/src/Makefile @@ -0,0 +1,27 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# 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 $(topsrcdir)/build-aux/Makefile.head.mk + + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/busctl/Makefile b/src/busctl/Makefile index e7ef92824c..a439fa56c5 100644 --- a/src/busctl/Makefile +++ b/src/busctl/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 bin_PROGRAMS += \ diff --git a/src/grp-boot/Makefile b/src/grp-boot/Makefile new file mode 100644 index 0000000000..3446ec8cab --- /dev/null +++ b/src/grp-boot/Makefile @@ -0,0 +1,27 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# 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 $(topsrcdir)/build-aux/Makefile.head.mk + +at.subdirs += bootctl systemd-boot +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-boot/bootctl/Makefile b/src/grp-boot/bootctl/Makefile index ae0fd9c630..ff729aa9d2 100644 --- a/src/grp-boot/bootctl/Makefile +++ b/src/grp-boot/bootctl/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 ($(ENABLE_EFI),) diff --git a/src/grp-boot/systemd-boot/Makefile b/src/grp-boot/systemd-boot/Makefile index 2e26fa9fb9..a9b731375c 100644 --- a/src/grp-boot/systemd-boot/Makefile +++ b/src/grp-boot/systemd-boot/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 ($(ENABLE_EFI),) diff --git a/src/grp-coredump/Makefile b/src/grp-coredump/Makefile new file mode 100644 index 0000000000..75885f5e32 --- /dev/null +++ b/src/grp-coredump/Makefile @@ -0,0 +1,27 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# 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 $(topsrcdir)/build-aux/Makefile.head.mk + +at.subdirs += coredumpctl systemd-coredump +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-coredump/coredumpctl/Makefile b/src/grp-coredump/coredumpctl/Makefile index 5118cdcb3f..1f740186b3 100644 --- a/src/grp-coredump/coredumpctl/Makefile +++ b/src/grp-coredump/coredumpctl/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 coredumpctl_SOURCES = \ diff --git a/src/grp-coredump/systemd-coredump/Makefile b/src/grp-coredump/systemd-coredump/Makefile index c8e8d45854..e0f8ab6035 100644 --- a/src/grp-coredump/systemd-coredump/Makefile +++ b/src/grp-coredump/systemd-coredump/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 ($(ENABLE_COREDUMP),) diff --git a/src/grp-machine/Makefile b/src/grp-machine/Makefile new file mode 100644 index 0000000000..25460fdb7b --- /dev/null +++ b/src/grp-machine/Makefile @@ -0,0 +1,27 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# 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 $(topsrcdir)/build-aux/Makefile.head.mk + +at.subdirs += machinectl systemd-machined +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-machine/libmachine-core/Makefile b/src/grp-machine/libmachine-core/Makefile index e65791038a..5927d87bb8 100644 --- a/src/grp-machine/libmachine-core/Makefile +++ b/src/grp-machine/libmachine-core/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 libmachine_core_la_SOURCES = \ diff --git a/src/grp-machine/machinectl/Makefile b/src/grp-machine/machinectl/Makefile index 924e2096de..ec1f402ad3 100644 --- a/src/grp-machine/machinectl/Makefile +++ b/src/grp-machine/machinectl/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 machinectl_SOURCES = \ diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile index eca80ac621..c59463f52b 100644 --- a/src/grp-machine/nss-mymachines/Makefile +++ b/src/grp-machine/nss-mymachines/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 diff --git a/src/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile index 7b6f89f907..b59ee910b4 100644 --- a/src/grp-machine/systemd-machined/Makefile +++ b/src/grp-machine/systemd-machined/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 systemd_machined_SOURCES = \ diff --git a/src/grp-resolve/systemd-resolved/Makefile b/src/grp-resolve/systemd-resolved/Makefile index e899cfd04d..f2aa850301 100644 --- a/src/grp-resolve/systemd-resolved/Makefile +++ b/src/grp-resolve/systemd-resolved/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 ($(ENABLE_RESOLVED),) diff --git a/src/grp-system/systemctl/Makefile b/src/grp-system/systemctl/Makefile index 5cb8c922d9..b5d9d8a148 100644 --- a/src/grp-system/systemctl/Makefile +++ b/src/grp-system/systemctl/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 systemctl_SOURCES = \ diff --git a/src/grp-system/systemd/Makefile b/src/grp-system/systemd/Makefile index 8abfa2bf9d..8b786e2853 100644 --- a/src/grp-system/systemd/Makefile +++ b/src/grp-system/systemd/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 systemd_SOURCES = \ diff --git a/src/grp-timedate/systemd-timedated/Makefile b/src/grp-timedate/systemd-timedated/Makefile index 38a180bd3a..2d36db83b8 100644 --- a/src/grp-timedate/systemd-timedated/Makefile +++ b/src/grp-timedate/systemd-timedated/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 ($(ENABLE_TIMEDATED),) diff --git a/src/grp-timedate/timedatectl/Makefile b/src/grp-timedate/timedatectl/Makefile index 1eb47c10b9..e186da3104 100644 --- a/src/grp-timedate/timedatectl/Makefile +++ b/src/grp-timedate/timedatectl/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 ($(ENABLE_TIMEDATED),) diff --git a/src/hostname/Makefile b/src/hostname/Makefile index f601560f0a..44397c6a27 100644 --- a/src/hostname/Makefile +++ b/src/hostname/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 ($(ENABLE_HOSTNAMED),) diff --git a/src/import/Makefile b/src/import/Makefile index 909662b1b4..9ac1cfe830 100644 --- a/src/import/Makefile +++ b/src/import/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 ($(ENABLE_IMPORTD),) diff --git a/src/initctl/Makefile b/src/initctl/Makefile index b63a2e47d9..889b8e63e3 100644 --- a/src/initctl/Makefile +++ b/src/initctl/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 systemd_initctl_SOURCES = \ diff --git a/src/journal-remote/Makefile b/src/journal-remote/Makefile index a95f6ab31a..e61ec99596 100644 --- a/src/journal-remote/Makefile +++ b/src/journal-remote/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/journal/Makefile b/src/journal/Makefile index 4a7d6122c1..a6d91bbc88 100644 --- a/src/journal/Makefile +++ b/src/journal/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 diff --git a/src/kernel-install/Makefile b/src/kernel-install/Makefile index d50b684d01..d77b90d86f 100644 --- a/src/kernel-install/Makefile +++ b/src/kernel-install/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 dist_bin_SCRIPTS = \ diff --git a/src/libbasic/Makefile b/src/libbasic/Makefile index 10f79ec40a..d430fa3f9c 100644 --- a/src/libbasic/Makefile +++ b/src/libbasic/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 noinst_LTLIBRARIES += \ diff --git a/src/libbus-proxy-core/Makefile b/src/libbus-proxy-core/Makefile index f3cf4a055f..44214fa5a3 100644 --- a/src/libbus-proxy-core/Makefile +++ b/src/libbus-proxy-core/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 noinst_LTLIBRARIES += \ diff --git a/src/libcore/Makefile b/src/libcore/Makefile index 5eef67be3d..c99df83e9d 100644 --- a/src/libcore/Makefile +++ b/src/libcore/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 noinst_LTLIBRARIES += \ diff --git a/src/libfirewall/Makefile b/src/libfirewall/Makefile index ced0f7e476..d9f5e88582 100644 --- a/src/libfirewall/Makefile +++ b/src/libfirewall/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_LIBIPTC),) diff --git a/src/libshared/Makefile b/src/libshared/Makefile index 6d2117a77d..a9f6fc34f6 100644 --- a/src/libshared/Makefile +++ b/src/libshared/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 noinst_LTLIBRARIES += \ diff --git a/src/libsystemd-network/Makefile b/src/libsystemd-network/Makefile index 45f782b184..18f93fe909 100644 --- a/src/libsystemd-network/Makefile +++ b/src/libsystemd-network/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 noinst_LTLIBRARIES += \ diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile index ea2c35d62a..512f53f903 100644 --- a/src/libsystemd/Makefile +++ b/src/libsystemd/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 LIBSYSTEMD_CURRENT=14 diff --git a/src/libsystemd/compat-libs/Makefile b/src/libsystemd/compat-libs/Makefile index 1c2527ae28..1112ed2685 100644 --- a/src/libsystemd/compat-libs/Makefile +++ b/src/libsystemd/compat-libs/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 ($(ENABLE_COMPAT_LIBS),) diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile index b22e645d98..d31028c891 100644 --- a/src/libsystemd/libsystemd-internal/Makefile +++ b/src/libsystemd/libsystemd-internal/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 libsystemd_internal_la_SOURCES = \ diff --git a/src/libsystemd/libsystemd-journal-internal/Makefile b/src/libsystemd/libsystemd-journal-internal/Makefile index aa8c5546c4..070365c216 100644 --- a/src/libsystemd/libsystemd-journal-internal/Makefile +++ b/src/libsystemd/libsystemd-journal-internal/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 audit_list_includes = -include linux/audit.h -include missing.h diff --git a/src/libudev/Makefile b/src/libudev/Makefile index 7ed2706100..a848c38fd0 100644 --- a/src/libudev/Makefile +++ b/src/libudev/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 at.subdirs += src diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile index 255a19982b..2d2d8018e6 100644 --- a/src/libudev/src/Makefile +++ b/src/libudev/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 LIBUDEV_CURRENT=7 diff --git a/src/locale/Makefile b/src/locale/Makefile index cda2d17d4c..50df867a9d 100644 --- a/src/locale/Makefile +++ b/src/locale/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 ($(ENABLE_LOCALED),) diff --git a/src/login/Makefile b/src/login/Makefile index 85c79a93b6..6d74547dd3 100644 --- a/src/login/Makefile +++ b/src/login/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 ($(ENABLE_LOGIND),) diff --git a/src/machine-id-setup/Makefile b/src/machine-id-setup/Makefile index 125471d17a..2cdff1ee9c 100644 --- a/src/machine-id-setup/Makefile +++ b/src/machine-id-setup/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 systemd_machine_id_setup_SOURCES = \ diff --git a/src/modules-load/Makefile b/src/modules-load/Makefile index ab334e16e8..cc23e1889d 100644 --- a/src/modules-load/Makefile +++ b/src/modules-load/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_KMOD),) diff --git a/src/network/Makefile b/src/network/Makefile index 3453a9c56d..bd5043478c 100644 --- a/src/network/Makefile +++ b/src/network/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 ($(ENABLE_NETWORKD),) diff --git a/src/nss-myhostname/Makefile b/src/nss-myhostname/Makefile index 9af5aeabc2..7e1711a799 100644 --- a/src/nss-myhostname/Makefile +++ b/src/nss-myhostname/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_MYHOSTNAME),) diff --git a/src/sleep/Makefile b/src/sleep/Makefile index 2d8854bbf9..7f403af4d1 100644 --- a/src/sleep/Makefile +++ b/src/sleep/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 systemd_sleep_SOURCES = \ diff --git a/src/socket-proxy/Makefile b/src/socket-proxy/Makefile index cead4f37a9..3caa96d6aa 100644 --- a/src/socket-proxy/Makefile +++ b/src/socket-proxy/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 diff --git a/src/sysctl/Makefile b/src/sysctl/Makefile index 31d38d9104..fc8d35e97a 100644 --- a/src/sysctl/Makefile +++ b/src/sysctl/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 systemd_sysctl_SOURCES = \ diff --git a/src/systemd-ac-power/Makefile b/src/systemd-ac-power/Makefile index b06af09332..87d34df16b 100644 --- a/src/systemd-ac-power/Makefile +++ b/src/systemd-ac-power/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 systemd_ac_power_SOURCES = \ diff --git a/src/systemd-activate/Makefile b/src/systemd-activate/Makefile index 058e10809e..f2da7e62b7 100644 --- a/src/systemd-activate/Makefile +++ b/src/systemd-activate/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 diff --git a/src/systemd-analyze/Makefile b/src/systemd-analyze/Makefile index c8a3d805fd..00fe1a6b35 100644 --- a/src/systemd-analyze/Makefile +++ b/src/systemd-analyze/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 systemd_analyze_SOURCES = \ diff --git a/src/systemd-ask-password/Makefile b/src/systemd-ask-password/Makefile index 11f3c8038a..752a39263e 100644 --- a/src/systemd-ask-password/Makefile +++ b/src/systemd-ask-password/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 systemd_ask_password_SOURCES = \ diff --git a/src/systemd-backlight/Makefile b/src/systemd-backlight/Makefile index 115285ec40..895fecf9f0 100644 --- a/src/systemd-backlight/Makefile +++ b/src/systemd-backlight/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 ($(ENABLE_BACKLIGHT),) diff --git a/src/systemd-binfmt/Makefile b/src/systemd-binfmt/Makefile index 6f520311e4..1493a2495e 100644 --- a/src/systemd-binfmt/Makefile +++ b/src/systemd-binfmt/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 ($(ENABLE_BINFMT),) diff --git a/src/systemd-bootchart/Makefile b/src/systemd-bootchart/Makefile index 26be9339a9..0aa0a98740 100644 --- a/src/systemd-bootchart/Makefile +++ b/src/systemd-bootchart/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 ($(ENABLE_BOOTCHART),) diff --git a/src/systemd-bus-proxyd/Makefile b/src/systemd-bus-proxyd/Makefile index 75e98b1633..cf0e4b1951 100644 --- a/src/systemd-bus-proxyd/Makefile +++ b/src/systemd-bus-proxyd/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 systemd_bus_proxyd_SOURCES = \ diff --git a/src/systemd-cgls/Makefile b/src/systemd-cgls/Makefile index 72f43638b1..4974cb9677 100644 --- a/src/systemd-cgls/Makefile +++ b/src/systemd-cgls/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 systemd_cgls_SOURCES = \ diff --git a/src/systemd-cgroups-agent/Makefile b/src/systemd-cgroups-agent/Makefile index 5c7d9d03ab..240284ffef 100644 --- a/src/systemd-cgroups-agent/Makefile +++ b/src/systemd-cgroups-agent/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 systemd_cgroups_agent_SOURCES = \ diff --git a/src/systemd-cgtop/Makefile b/src/systemd-cgtop/Makefile index 5e379895a8..6e6931be7c 100644 --- a/src/systemd-cgtop/Makefile +++ b/src/systemd-cgtop/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 systemd_cgtop_SOURCES = \ diff --git a/src/systemd-cryptsetup/Makefile b/src/systemd-cryptsetup/Makefile index 7ab3605a31..e53bd833fd 100644 --- a/src/systemd-cryptsetup/Makefile +++ b/src/systemd-cryptsetup/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_LIBCRYPTSETUP),) diff --git a/src/systemd-dbus1-generator/Makefile b/src/systemd-dbus1-generator/Makefile index 1d7f0d1a81..12c9b8baf6 100644 --- a/src/systemd-dbus1-generator/Makefile +++ b/src/systemd-dbus1-generator/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 systemgenerator_PROGRAMS += \ diff --git a/src/systemd-debug-generator/Makefile b/src/systemd-debug-generator/Makefile index 79684a8a7a..75996cfc1e 100644 --- a/src/systemd-debug-generator/Makefile +++ b/src/systemd-debug-generator/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 systemd_debug_generator_SOURCES = \ diff --git a/src/systemd-delta/Makefile b/src/systemd-delta/Makefile index b9124f86ea..7a1e44a3fd 100644 --- a/src/systemd-delta/Makefile +++ b/src/systemd-delta/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 systemd_delta_SOURCES = \ diff --git a/src/systemd-detect-virt/Makefile b/src/systemd-detect-virt/Makefile index 529a3a2561..6bf88701bf 100644 --- a/src/systemd-detect-virt/Makefile +++ b/src/systemd-detect-virt/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 systemd_detect_virt_SOURCES = \ diff --git a/src/systemd-escape/Makefile b/src/systemd-escape/Makefile index 6589e06525..660d1362bb 100644 --- a/src/systemd-escape/Makefile +++ b/src/systemd-escape/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 systemd_escape_SOURCES = \ diff --git a/src/systemd-firstboot/Makefile b/src/systemd-firstboot/Makefile index 931cf485e6..c6b2a84087 100644 --- a/src/systemd-firstboot/Makefile +++ b/src/systemd-firstboot/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 ($(ENABLE_FIRSTBOOT),) diff --git a/src/systemd-fsck/Makefile b/src/systemd-fsck/Makefile index 9c981837f5..09b83ea859 100644 --- a/src/systemd-fsck/Makefile +++ b/src/systemd-fsck/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 systemd_fsck_SOURCES = \ diff --git a/src/systemd-fstab-generator/Makefile b/src/systemd-fstab-generator/Makefile index 4d201612b8..2e0fa1af3c 100644 --- a/src/systemd-fstab-generator/Makefile +++ b/src/systemd-fstab-generator/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 systemd_fstab_generator_SOURCES = \ diff --git a/src/systemd-getty-generator/Makefile b/src/systemd-getty-generator/Makefile index a070f1c424..b22c26111c 100644 --- a/src/systemd-getty-generator/Makefile +++ b/src/systemd-getty-generator/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 systemd_getty_generator_SOURCES = \ diff --git a/src/systemd-gpt-auto-generator/Makefile b/src/systemd-gpt-auto-generator/Makefile index 177db8da7c..3cf65cf9ed 100644 --- a/src/systemd-gpt-auto-generator/Makefile +++ b/src/systemd-gpt-auto-generator/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_BLKID),) diff --git a/src/systemd-hibernate-resume/Makefile b/src/systemd-hibernate-resume/Makefile index baee443e84..5ace69b353 100644 --- a/src/systemd-hibernate-resume/Makefile +++ b/src/systemd-hibernate-resume/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 ($(ENABLE_HIBERNATE),) diff --git a/src/systemd-hwdb/Makefile b/src/systemd-hwdb/Makefile index 47f900aefc..b62e7daa2a 100644 --- a/src/systemd-hwdb/Makefile +++ b/src/systemd-hwdb/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 ($(ENABLE_HWDB),) diff --git a/src/systemd-notify/Makefile b/src/systemd-notify/Makefile index c5402385b9..242adb9803 100644 --- a/src/systemd-notify/Makefile +++ b/src/systemd-notify/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 systemd_notify_SOURCES = \ diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index b276bd6ceb..d1f44faf80 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/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 systemd_nspawn_SOURCES = \ diff --git a/src/systemd-path/Makefile b/src/systemd-path/Makefile index 19eb6bd10a..782347c3a4 100644 --- a/src/systemd-path/Makefile +++ b/src/systemd-path/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 systemd_path_SOURCES = \ diff --git a/src/systemd-quotacheck/Makefile b/src/systemd-quotacheck/Makefile index 42ff1dc814..204fdd2f29 100644 --- a/src/systemd-quotacheck/Makefile +++ b/src/systemd-quotacheck/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 ($(ENABLE_QUOTACHECK),) diff --git a/src/systemd-random-seed/Makefile b/src/systemd-random-seed/Makefile index d32f124c9a..5ff78c357f 100644 --- a/src/systemd-random-seed/Makefile +++ b/src/systemd-random-seed/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 ($(ENABLE_RANDOMSEED),) diff --git a/src/systemd-rc-local-generator/Makefile b/src/systemd-rc-local-generator/Makefile index 2e9b3e7a64..26706f0ff2 100644 --- a/src/systemd-rc-local-generator/Makefile +++ b/src/systemd-rc-local-generator/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 systemd_rc_local_generator_SOURCES = \ diff --git a/src/systemd-remount-fs/Makefile b/src/systemd-remount-fs/Makefile index 91baa27bf1..dadb65f483 100644 --- a/src/systemd-remount-fs/Makefile +++ b/src/systemd-remount-fs/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 systemd_remount_fs_SOURCES = \ diff --git a/src/systemd-reply-password/Makefile b/src/systemd-reply-password/Makefile index 30283141aa..5a113a1e26 100644 --- a/src/systemd-reply-password/Makefile +++ b/src/systemd-reply-password/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 systemd_reply_password_SOURCES = \ diff --git a/src/systemd-rfkill/Makefile b/src/systemd-rfkill/Makefile index 4cb5137e63..9df508ea18 100644 --- a/src/systemd-rfkill/Makefile +++ b/src/systemd-rfkill/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 ($(ENABLE_RFKILL),) diff --git a/src/systemd-run/Makefile b/src/systemd-run/Makefile index afa2d0f34c..3d291a3c87 100644 --- a/src/systemd-run/Makefile +++ b/src/systemd-run/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 systemd_run_SOURCES = \ diff --git a/src/systemd-shutdown/Makefile b/src/systemd-shutdown/Makefile index 0695f3927d..2de02bbf81 100644 --- a/src/systemd-shutdown/Makefile +++ b/src/systemd-shutdown/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 systemd_shutdown_SOURCES = \ diff --git a/src/systemd-stdio-bridge/Makefile b/src/systemd-stdio-bridge/Makefile index 650240a908..44b5b644c7 100644 --- a/src/systemd-stdio-bridge/Makefile +++ b/src/systemd-stdio-bridge/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 systemd_stdio_bridge_SOURCES = \ diff --git a/src/systemd-system-update-generator/Makefile b/src/systemd-system-update-generator/Makefile index 62f750c182..cad628b174 100644 --- a/src/systemd-system-update-generator/Makefile +++ b/src/systemd-system-update-generator/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 systemd_system_update_generator_SOURCES = \ diff --git a/src/systemd-sysv-generator/Makefile b/src/systemd-sysv-generator/Makefile index f6de146408..aff65a8723 100644 --- a/src/systemd-sysv-generator/Makefile +++ b/src/systemd-sysv-generator/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 systemd_sysv_generator_SOURCES = \ diff --git a/src/systemd-timesync/Makefile b/src/systemd-timesync/Makefile index a329865019..0cd01c3f59 100644 --- a/src/systemd-timesync/Makefile +++ b/src/systemd-timesync/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 ($(ENABLE_TIMESYNCD),) diff --git a/src/systemd-tmpfiles/Makefile b/src/systemd-tmpfiles/Makefile index c193b9c37d..cdceb02637 100644 --- a/src/systemd-tmpfiles/Makefile +++ b/src/systemd-tmpfiles/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 ($(ENABLE_TMPFILES),) diff --git a/src/systemd-tty-ask-password-agent/Makefile b/src/systemd-tty-ask-password-agent/Makefile index 37b51da33b..664e3f0bdb 100644 --- a/src/systemd-tty-ask-password-agent/Makefile +++ b/src/systemd-tty-ask-password-agent/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 systemd_tty_ask_password_agent_SOURCES = \ diff --git a/src/systemd-update-done/Makefile b/src/systemd-update-done/Makefile index ae592db650..7e05c3a1c6 100644 --- a/src/systemd-update-done/Makefile +++ b/src/systemd-update-done/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 systemd_update_done_SOURCES = \ diff --git a/src/systemd-update-utmp/Makefile b/src/systemd-update-utmp/Makefile index 182c7534e7..37e93465a7 100644 --- a/src/systemd-update-utmp/Makefile +++ b/src/systemd-update-utmp/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 systemd_update_utmp_SOURCES = \ diff --git a/src/systemd-vconsole/Makefile b/src/systemd-vconsole/Makefile index 466829c1b9..60ed808d61 100644 --- a/src/systemd-vconsole/Makefile +++ b/src/systemd-vconsole/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 ($(ENABLE_VCONSOLE),) diff --git a/src/sysusers/Makefile b/src/sysusers/Makefile index c9aaad0369..6897ce35b1 100644 --- a/src/sysusers/Makefile +++ b/src/sysusers/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 ($(ENABLE_SYSUSERS),) diff --git a/src/test/Makefile b/src/test/Makefile index f416b4aadf..95b585c3b7 100644 --- a/src/test/Makefile +++ b/src/test/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 test_id128_SOURCES = \ diff --git a/src/udev/Makefile b/src/udev/Makefile index 8449d56635..4cb564bb16 100644 --- a/src/udev/Makefile +++ b/src/udev/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 INSTALL_DIRS += \ diff --git a/src/udev/ata_id/Makefile b/src/udev/ata_id/Makefile index e70e2573bd..e2daf2e713 100644 --- a/src/udev/ata_id/Makefile +++ b/src/udev/ata_id/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 ata_id_SOURCES = \ diff --git a/src/udev/cdrom_id/Makefile b/src/udev/cdrom_id/Makefile index f7583cfb70..aeee286085 100644 --- a/src/udev/cdrom_id/Makefile +++ b/src/udev/cdrom_id/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 cdrom_id_SOURCES = \ diff --git a/src/udev/collect/Makefile b/src/udev/collect/Makefile index 88dbaa1d82..93a5939b2e 100644 --- a/src/udev/collect/Makefile +++ b/src/udev/collect/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 collect_SOURCES = \ diff --git a/src/udev/mtd_probe/Makefile b/src/udev/mtd_probe/Makefile index 719993ed0f..e3bf5e1ef0 100644 --- a/src/udev/mtd_probe/Makefile +++ b/src/udev/mtd_probe/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 mtd_probe_SOURCES = \ diff --git a/src/udev/scsi_id/Makefile b/src/udev/scsi_id/Makefile index eaf5a51734..7d349dc0e9 100644 --- a/src/udev/scsi_id/Makefile +++ b/src/udev/scsi_id/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 scsi_id_SOURCES =\ diff --git a/src/udev/v4l_id/Makefile b/src/udev/v4l_id/Makefile index c2815b6809..493454121f 100644 --- a/src/udev/v4l_id/Makefile +++ b/src/udev/v4l_id/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 v4l_id_SOURCES = \ diff --git a/test/Makefile b/test/Makefile index e95f00818b..6a4925b6e1 100644 --- a/test/Makefile +++ b/test/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 |