fix

6 files changed, 15 insertions, 134 deletions

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