From 623f13d8198b83df890f014b1d27255f4d78f35b Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Fri, 21 Oct 2016 03:00:49 -0400
Subject: wip

---
 src/busctl/Makefile            |  1 +
 src/busctl/busctl-introspect.c |  8 ++++----
 src/busctl/busctl.c            | 28 ++++++++++++++--------------
 3 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'src/busctl')

diff --git a/src/busctl/Makefile b/src/busctl/Makefile
index bb41d82b85..9e8f1fac4f 100644
--- a/src/busctl/Makefile
+++ b/src/busctl/Makefile
@@ -32,6 +32,7 @@ busctl_SOURCES = \
 	src/libsystemd/sd-bus/busctl-introspect.h
 
 busctl_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/busctl/busctl-introspect.c b/src/busctl/busctl-introspect.c
index 5c92c55483..6f7c1d2a75 100644
--- a/src/busctl/busctl-introspect.c
+++ b/src/busctl/busctl-introspect.c
@@ -19,10 +19,10 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "basic/xml.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-basic/xml.h"
 
 #include "busctl-introspect.h"
 
diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index 9e3644728d..cc7ca1ae19 100644
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -21,24 +21,24 @@
 
 #include <systemd/sd-bus.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/locale-util.h"
-#include "basic/log.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/set.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
 #include "sd-bus/bus-dump.h"
 #include "sd-bus/bus-internal.h"
 #include "sd-bus/bus-signature.h"
 #include "sd-bus/bus-type.h"
-#include "shared/bus-util.h"
-#include "shared/pager.h"
+#include "sd-bus/bus-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/locale-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/set.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/terminal-util.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/pager.h"
 
 #include "busctl-introspect.h"
 
-- 
cgit v1.2.3-54-g00ecf