diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 03:34:46 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 03:34:46 -0400 |
| commit | 9ea83619baf30c4bd5cc27b51fd580925aa7db8b (patch) | |
| tree | 72cf4f38405786217871494c2e39e69d4f1dad01 /src/libsystemd | |
| parent | 826cd8f58443fc86d3ea61a4e49d29ee7abb8b1c (diff) | |
| parent | 37bb75d08b392517c50f6e97ff27484cfd255c08 (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/Makefile
# src/grp-boot/Makefile
# src/grp-coredump/Makefile
# src/grp-machine/Makefile
# src/libsystemd/libsystemd-internal/subdir.mk
# src/libudev/Makefile
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/compat-libs/Makefile | 2 | ||||
| -rw-r--r-- | src/libsystemd/libsystemd-internal/subdir.mk | 25 |
2 files changed, 25 insertions, 2 deletions
diff --git a/src/libsystemd/compat-libs/Makefile b/src/libsystemd/compat-libs/Makefile index 1c2527ae28..d0ed978072 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/subdir.mk b/src/libsystemd/libsystemd-internal/subdir.mk index 9ec814aa70..ceeff9ca0e 100644 --- a/src/libsystemd/libsystemd-internal/subdir.mk +++ b/src/libsystemd/libsystemd-internal/subdir.mk @@ -1,4 +1,27 @@ -include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk +# -*- 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 systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) |