fix

23 files changed, 72 insertions, 190 deletions

diff --git a/src/grp-network/libnetworkd-core/networkd-dhcp4.c b/src/grp-network/libnetworkd-core/networkd-dhcp4.c
index b74541ed11..371613043e 100644
--- a/src/grp-network/libnetworkd-core/networkd-dhcp4.c
+++ b/src/grp-network/libnetworkd-core/networkd-dhcp4.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <linux/if.h>
 #include <netinet/ether.h>
+#include <linux/if.h>
 
 #include "basic/alloc-util.h"
 #include "basic/hostname-util.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-dhcp6.c b/src/grp-network/libnetworkd-core/networkd-dhcp6.c
index cf2f4e3af5..9ebb162d6c 100644
--- a/src/grp-network/libnetworkd-core/networkd-dhcp6.c
+++ b/src/grp-network/libnetworkd-core/networkd-dhcp6.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <linux/if.h>
 #include <netinet/ether.h>
+#include <linux/if.h>
 
 #include "systemd-network/network-internal.h"
 #include "systemd-network/sd-dhcp6-client.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-ipv4ll.c b/src/grp-network/libnetworkd-core/networkd-ipv4ll.c
index ac7266d0cf..d196aa909f 100644
--- a/src/grp-network/libnetworkd-core/networkd-ipv4ll.c
+++ b/src/grp-network/libnetworkd-core/networkd-ipv4ll.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <linux/if.h>
 #include <netinet/ether.h>
+#include <linux/if.h>
 
 #include "systemd-network/network-internal.h"
 
diff --git a/src/grp-network/libnetworkd-core/networkd-link.c b/src/grp-network/libnetworkd-core/networkd-link.c
index 53c3712cb6..f4cef69fbb 100644
--- a/src/grp-network/libnetworkd-core/networkd-link.c
+++ b/src/grp-network/libnetworkd-core/networkd-link.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <linux/if.h>
 #include <netinet/ether.h>
+#include <linux/if.h>
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
diff --git a/src/grp-network/libnetworkd-core/networkd-manager.c b/src/grp-network/libnetworkd-core/networkd-manager.c
index 5ce81223bf..0f54debf07 100644
--- a/src/grp-network/libnetworkd-core/networkd-manager.c
+++ b/src/grp-network/libnetworkd-core/networkd-manager.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 
-#include <linux/if.h>
 #include <sys/socket.h>
+#include <linux/if.h>
 
 #include <systemd/sd-daemon.h>
 
diff --git a/src/grp-network/libnetworkd-core/networkd-ndisc.c b/src/grp-network/libnetworkd-core/networkd-ndisc.c
index 5480cc465d..1033ccc342 100644
--- a/src/grp-network/libnetworkd-core/networkd-ndisc.c
+++ b/src/grp-network/libnetworkd-core/networkd-ndisc.c
@@ -17,10 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <linux/if.h>
 #include <netinet/ether.h>
 #include <netinet/icmp6.h>
 #include <netinet/in.h>
+#include <linux/if.h>
 
 #include "systemd-network/sd-ndisc.h"
 
diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c
index 62ae9e9b4f..02bf652c0b 100644
--- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c
+++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c
@@ -17,9 +17,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <fnmatch.h>
-#include <linux/if.h>
 #include <netinet/ether.h>
+#include <linux/if.h>
+#include <fnmatch.h>
 
 #include "basic/alloc-util.h"
 #include "basic/time-util.h"
diff --git a/src/grp-system/libcore/namespace.c b/src/grp-system/libcore/namespace.c
index cb85074cce..5af026ff99 100644
--- a/src/grp-system/libcore/namespace.c
+++ b/src/grp-system/libcore/namespace.c
@@ -18,13 +18,13 @@
 ***/
 
 #include <errno.h>
-#include <linux/fs.h>
 #include <sched.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <linux/fs.h>
 
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
diff --git a/src/grp-system/libcore/target.c b/src/grp-system/libcore/target.c
index e62a49be84..74af0ced0c 100644
--- a/src/grp-system/libcore/target.c
+++ b/src/grp-system/libcore/target.c
@@ -23,7 +23,6 @@
 #include "basic/unit-name.h"
 
 #include "dbus-target.h"
-#include "target.h"
 #include "unit.h"
 
 static const UnitActiveState state_translation_table[_TARGET_STATE_MAX] = {
diff --git a/src/grp-system/libcore/target.h b/src/grp-system/libcore/target.h
index 339aea154e..9ac560ab17 100644
--- a/src/grp-system/libcore/target.h
+++ b/src/grp-system/libcore/target.h
@@ -19,6 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#if __INCLUDE_LEVEL__ <= 1
+#error "Do not include target.h directly; use unit.h, which includes target.h."
+#endif
+
 typedef struct Target Target;
 
 struct Target {
diff --git a/src/grp-system/libcore/unit.h b/src/grp-system/libcore/unit.h
index df1174b837..79de5a8a89 100644
--- a/src/grp-system/libcore/unit.h
+++ b/src/grp-system/libcore/unit.h
@@ -23,16 +23,17 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "shared/condition.h"
+#include "shared/install.h"
+#include "basic/list.h"
+#include "basic/unit-name.h"
+
 typedef struct Unit Unit;
 typedef struct UnitVTable UnitVTable;
 typedef struct UnitRef UnitRef;
 typedef struct UnitStatusMessageFormats UnitStatusMessageFormats;
 
-#include "shared/condition.h"
 #include "failure-action.h"
-#include "shared/install.h"
-#include "basic/list.h"
-#include "basic/unit-name.h"
 
 typedef enum KillOperation {
         KILL_TERMINATE,
diff --git a/src/libshared/src/gcrypt-util.c b/src/libshared/src/gcrypt-util.c
index 069134a4be..35e380d3d0 100644
--- a/src/libshared/src/gcrypt-util.c
+++ b/src/libshared/src/gcrypt-util.c
@@ -23,7 +23,7 @@
 #include <gcrypt.h>
 
 #include "basic/hexdecoct.h"
-#include "shared/gcrypt-util.h"
+#include "gcrypt-util.h"
 
 void initialize_libgcrypt(bool secmem) {
         const char *p;
diff --git a/src/libsystemd/src/sd-device/Makefile b/src/libsystemd/src/sd-device/Makefile
index 821bb70dfc..71a1159ce0 100644..120000
--- a/src/libsystemd/src/sd-device/Makefile
+++ b/src/libsystemd/src/sd-device/Makefile
@@ -1,31 +1 @@
-#  -*- 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)
-systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
-systemd.CPPFLAGS += $(libshared.CPPFLAGS)
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
+../subdir.mk
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-device/device-internal.h b/src/libsystemd/src/sd-device/device-internal.h
index 5e5ae47339..a1a1d3c4e3 100644
--- a/src/libsystemd/src/sd-device/device-internal.h
+++ b/src/libsystemd/src/sd-device/device-internal.h
@@ -23,6 +23,8 @@
 #include "basic/hashmap.h"
 #include "basic/set.h"
 
+#include "sd-device.h"
+
 struct sd_device {
         uint64_t n_ref;
 
diff --git a/src/libsystemd/src/sd-hwdb/Makefile b/src/libsystemd/src/sd-hwdb/Makefile
index 821bb70dfc..71a1159ce0 100644..120000
--- a/src/libsystemd/src/sd-hwdb/Makefile
+++ b/src/libsystemd/src/sd-hwdb/Makefile
@@ -1,31 +1 @@
-#  -*- 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)
-systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
-systemd.CPPFLAGS += $(libshared.CPPFLAGS)
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
+../subdir.mk
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-netlink/netlink-types.c b/src/libsystemd/src/sd-netlink/netlink-types.c
index 3b013507bd..b4dcee26b7 100644
--- a/src/libsystemd/src/sd-netlink/netlink-types.c
+++ b/src/libsystemd/src/sd-netlink/netlink-types.c
@@ -17,18 +17,18 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <linux/if.h>
-#include <linux/if_addr.h>
-#include <linux/if_bridge.h>
-#include <linux/if_link.h>
-#include <linux/if_tunnel.h>
-#include <linux/in6.h>
-#include <linux/ip.h>
+#include <stdint.h>
+#include <sys/socket.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
+#include <linux/in6.h>
 #include <linux/veth.h>
-#include <stdint.h>
-#include <sys/socket.h>
+#include <linux/if_bridge.h>
+#include <linux/if_addr.h>
+#include <linux/if.h>
+#include <linux/ip.h>
+#include <linux/if_link.h>
+#include <linux/if_tunnel.h>
 
 #include "basic/macro.h"
 #include "basic/missing.h"
diff --git a/src/libsystemd/src/sd-network/Makefile b/src/libsystemd/src/sd-network/Makefile
index 821bb70dfc..71a1159ce0 100644..120000
--- a/src/libsystemd/src/sd-network/Makefile
+++ b/src/libsystemd/src/sd-network/Makefile
@@ -1,31 +1 @@
-#  -*- 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)
-systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
-systemd.CPPFLAGS += $(libshared.CPPFLAGS)
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
+../subdir.mk
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-resolve/Makefile b/src/libsystemd/src/sd-resolve/Makefile
index 2b0ea2c84f..71a1159ce0 100644..120000
--- a/src/libsystemd/src/sd-resolve/Makefile
+++ b/src/libsystemd/src/sd-resolve/Makefile
@@ -1,32 +1 @@
-#  -*- 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)
-systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
-systemd.CPPFLAGS += $(libshared.CPPFLAGS)
-systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
+../subdir.mk
\ No newline at end of file
diff --git a/src/libudev/src/.gitignore b/src/libudev/.gitignore
index 0c8a5d5231..0c8a5d5231 100644
--- a/src/libudev/src/.gitignore
+++ b/src/libudev/.gitignore
diff --git a/src/libudev/Makefile b/src/libudev/Makefile
index 8d9fecb1fb..05e622117e 100644
--- a/src/libudev/Makefile
+++ b/src/libudev/Makefile
@@ -23,6 +23,42 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+LIBUDEV_CURRENT=7
+LIBUDEV_REVISION=4
+LIBUDEV_AGE=6
+
+include_HEADERS += \
+	src/libudev/libudev.h
+
+rootlib_LTLIBRARIES += \
+	libudev.la
+
+libudev_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \
+	-Wl,--version-script=$(srcdir)/libudev.sym
+
+pkgconfiglib_DATA += \
+	src/libudev/libudev.pc
+
+EXTRA_DIST += \
+	src/libudev/libudev.pc.in
+
+$(outdir)/test-libudev-sym.c: \
+		$(srcdir)/libudev.sym \
+		$(srcdir)/udev.h
+	$(generate-sym-test)
+
+nodist_test_libudev_sym_SOURCES = \
+	test-libudev-sym.c
+test_libudev_sym_CFLAGS = \
+	$(AM_CFLAGS) \
+	-Wno-deprecated-declarations
+test_libudev_sym_LDADD = \
+	libudev.la
+
+systemd.sed_files += libudev.pc
+
 at.subdirs += src
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libudev/src/libudev.pc.in b/src/libudev/libudev.pc.in
index a0f3f524e0..a0f3f524e0 100644
--- a/src/libudev/src/libudev.pc.in
+++ b/src/libudev/libudev.pc.in
diff --git a/src/libudev/src/libudev.sym b/src/libudev/libudev.sym
index 76726fca77..76726fca77 100644
--- a/src/libudev/src/libudev.sym
+++ b/src/libudev/libudev.sym
diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile
index 2bc5227cfb..3f2f59ed39 100644
--- a/src/libudev/src/Makefile
+++ b/src/libudev/src/Makefile
@@ -23,17 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-LIBUDEV_CURRENT=7
-LIBUDEV_REVISION=4
-LIBUDEV_AGE=6
-
-include_HEADERS += \
-	src/libudev/libudev.h
-
-rootlib_LTLIBRARIES += \
-	libudev.la
-
-libudev_la_SOURCES =\
+libudev_internal_la_SOURCES =\
 	src/libudev/libudev.sym \
 	src/libudev/libudev-private.h \
 	src/libudev/libudev-device-internal.h \
@@ -47,39 +37,10 @@ libudev_la_SOURCES =\
 	src/libudev/libudev-queue.c \
 	src/libudev/libudev-hwdb.c
 
-libudev_la_LDFLAGS = \
-	$(AM_LDFLAGS) \
-	-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \
-	-Wl,--version-script=$(srcdir)/libudev.sym
-
-libudev_la_LIBADD = \
+libudev_internal_la_LIBADD = \
 	libsystemd-internal.la
 
-pkgconfiglib_DATA += \
-	src/libudev/libudev.pc
-
-EXTRA_DIST += \
-	src/libudev/libudev.pc.in
-
 noinst_LTLIBRARIES += \
 	libudev-internal.la
 
-libudev_internal_la_SOURCES =\
-	$(libudev_la_SOURCES)
-
-$(outdir)/test-libudev-sym.c: \
-		$(srcdir)/libudev.sym \
-		$(srcdir)/udev.h
-	$(generate-sym-test)
-
-nodist_test_libudev_sym_SOURCES = \
-	test-libudev-sym.c
-test_libudev_sym_CFLAGS = \
-	$(AM_CFLAGS) \
-	-Wno-deprecated-declarations
-test_libudev_sym_LDADD = \
-	libudev.la
-
-systemd.sed_files += libudev.pc
-
 include $(topsrcdir)/build-aux/Makefile.tail.mk