diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/grp-machine/machinectl/Makefile | 2 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/Makefile | 2 | ||||
-rw-r--r-- | src/grp-resolve/systemd-resolved/Makefile | 2 | ||||
-rw-r--r-- | src/grp-system/systemctl/Makefile | 2 | ||||
-rw-r--r-- | src/grp-system/systemd/Makefile | 2 | ||||
-rw-r--r-- | src/grp-timedate/systemd-timedated/Makefile | 2 | ||||
-rw-r--r-- | src/grp-timedate/timedatectl/Makefile | 2 | ||||
-rw-r--r-- | src/libsystemd/compat-libs/Makefile | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/subdir.mk | 25 | ||||
-rw-r--r-- | src/udev/Makefile | 4 | ||||
-rw-r--r-- | src/udev/ata_id/Makefile | 2 | ||||
-rw-r--r-- | src/udev/cdrom_id/Makefile | 2 | ||||
-rw-r--r-- | src/udev/collect/Makefile | 2 | ||||
-rw-r--r-- | src/udev/mtd_probe/Makefile | 2 | ||||
-rw-r--r-- | src/udev/scsi_id/Makefile | 2 | ||||
-rw-r--r-- | src/udev/v4l_id/Makefile | 2 |
16 files changed, 40 insertions, 17 deletions
diff --git a/src/grp-machine/machinectl/Makefile b/src/grp-machine/machinectl/Makefile index 924e2096de..556256eada 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/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile index 7b6f89f907..59540c18c4 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..fd27ed7409 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..20bd4f069c 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..0e34d8d829 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..b3288b22b1 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..c1be945443 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/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) diff --git a/src/udev/Makefile b/src/udev/Makefile index 4e475a5727..8449d56635 100644 --- a/src/udev/Makefile +++ b/src/udev/Makefile @@ -86,10 +86,10 @@ noinst_LTLIBRARIES += \ $(outdir)/keyboard-keys-list.txt: $(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@ -$(outdir)/keyboard-keys-from-name.gperf: src/udev/keyboard-keys-list.txt +$(outdir)/keyboard-keys-from-name.gperf: $(outdir)/keyboard-keys-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@ -$(outdir)/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf +$(outdir)/keyboard-keys-from-name.h: $(outdir)/keyboard-keys-from-name.gperf $(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@ gperf_txt_sources += \ diff --git a/src/udev/ata_id/Makefile b/src/udev/ata_id/Makefile index e70e2573bd..00a8c37ac2 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..a9297413d3 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..60af3b7627 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..d7392a8a3b 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..7064a864f7 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..0641af8065 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 = \ |