From c96a8767d897bd7312d1491635c9d9ef4e1df128 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Mon, 6 Jun 2016 20:15:28 -0400
Subject: tidy

---
 src/libcore/loopback-setup.c                                    | 1 -
 src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c | 1 -
 src/systemd-nspawn/Makefile                                     | 6 +++---
 src/systemd-nspawn/local-addresses.c                            | 1 +
 src/systemd-nspawn/local-addresses.h                            | 1 +
 src/systemd-nspawn/nspawn-expose-ports.c                        | 1 -
 src/systemd-nspawn/nspawn-network.c                             | 1 -
 src/systemd-nspawn/nspawn-register.c                            | 2 +-
 src/systemd-nspawn/nspawn.c                                     | 1 -
 9 files changed, 6 insertions(+), 9 deletions(-)
 create mode 120000 src/systemd-nspawn/local-addresses.c
 create mode 120000 src/systemd-nspawn/local-addresses.h

(limited to 'src')

diff --git a/src/libcore/loopback-setup.c b/src/libcore/loopback-setup.c
index d56bbfa6fc..1a8ec6166e 100644
--- a/src/libcore/loopback-setup.c
+++ b/src/libcore/loopback-setup.c
@@ -24,7 +24,6 @@
 
 #include "loopback-setup.h"
 #include "missing.h"
-#include "netlink-util.h"
 
 static int start_loopback(sd_netlink *rtnl) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c b/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c
index e6feb859cd..fafc208eca 100644
--- a/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c
+++ b/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c
@@ -23,7 +23,6 @@
 #include "alloc-util.h"
 #include "local-addresses.h"
 #include "macro.h"
-#include "netlink-util.h"
 
 static int address_compare(const void *_a, const void *_b) {
         const struct local_address *a = _a, *b = _b;
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index 4e163366e2..c10113273d 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -66,14 +66,14 @@ systemd_nspawn_LDADD += \
 	$(topoutdir)/src/libfirewall/libfirewall.la
 endif
 
+systemd_nspawn_SOURCES += local-addresses.c
 bin_PROGRAMS += systemd-nspawn
 $(eval $(value automake2autothing))
 at.depdirs += $(topoutdir)/src/libshared $(if $(HAVE_LIBIPTC),$(topoutdir)/src/libfirewall)
+AM_CPPFLAGS += $(libshared.CPPFLAGS) $(if $(HAVE_LIBIPTC),$(libfirewall.CPPFLAGS))
+
 AM_CPPFLAGS += $(libbasic.CPPFLAGS)
-AM_CPPFLAGS += $(libshared.CPPFLAGS)
 AM_CPPFLAGS += $(libsystemd.CPPFLAGS)
-AM_CPPFLAGS += $(libfirewall.CPPFLAGS)
-AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-netlink
 AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
 AM_CPPFLAGS += -I$(topsrcdir)/src/libudev/src
 
diff --git a/src/systemd-nspawn/local-addresses.c b/src/systemd-nspawn/local-addresses.c
new file mode 120000
index 0000000000..c9636cacab
--- /dev/null
+++ b/src/systemd-nspawn/local-addresses.c
@@ -0,0 +1 @@
+../libsystemd/libsystemd-internal/sd-netlink/local-addresses.c
\ No newline at end of file
diff --git a/src/systemd-nspawn/local-addresses.h b/src/systemd-nspawn/local-addresses.h
new file mode 120000
index 0000000000..7d801fe75c
--- /dev/null
+++ b/src/systemd-nspawn/local-addresses.h
@@ -0,0 +1 @@
+../libsystemd/libsystemd-internal/sd-netlink/local-addresses.h
\ No newline at end of file
diff --git a/src/systemd-nspawn/nspawn-expose-ports.c b/src/systemd-nspawn/nspawn-expose-ports.c
index 8122a14f7b..71eb88873c 100644
--- a/src/systemd-nspawn/nspawn-expose-ports.c
+++ b/src/systemd-nspawn/nspawn-expose-ports.c
@@ -24,7 +24,6 @@
 #include "firewall-util.h"
 #include "in-addr-util.h"
 #include "local-addresses.h"
-#include "netlink-util.h"
 #include "nspawn-expose-ports.h"
 #include "parse-util.h"
 #include "socket-util.h"
diff --git a/src/systemd-nspawn/nspawn-network.c b/src/systemd-nspawn/nspawn-network.c
index d03fd001a7..58d6035ddb 100644
--- a/src/systemd-nspawn/nspawn-network.c
+++ b/src/systemd-nspawn/nspawn-network.c
@@ -26,7 +26,6 @@
 
 #include "alloc-util.h"
 #include "ether-addr-util.h"
-#include "netlink-util.h"
 #include "nspawn-network.h"
 #include "siphash24.h"
 #include "string-util.h"
diff --git a/src/systemd-nspawn/nspawn-register.c b/src/systemd-nspawn/nspawn-register.c
index 3b0d778f43..de1433a5e2 100644
--- a/src/systemd-nspawn/nspawn-register.c
+++ b/src/systemd-nspawn/nspawn-register.c
@@ -19,7 +19,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "bus-error.h"
+#include "bus-error.h" /* for bus_error_message */
 #include "bus-util.h"
 #include "nspawn-register.h"
 #include "stat-util.h"
diff --git a/src/systemd-nspawn/nspawn.c b/src/systemd-nspawn/nspawn.c
index add66be183..1de527b57b 100644
--- a/src/systemd-nspawn/nspawn.c
+++ b/src/systemd-nspawn/nspawn.c
@@ -69,7 +69,6 @@
 #include "missing.h"
 #include "mkdir.h"
 #include "mount-util.h"
-#include "netlink-util.h"
 #include "nspawn-cgroup.h"
 #include "nspawn-expose-ports.h"
 #include "nspawn-mount.h"
-- 
cgit v1.2.3-54-g00ecf