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/grp-utils/systemd-ac-power/ac-power.c        |  2 +-
 src/grp-utils/systemd-escape/escape.c            | 10 +++++-----
 src/grp-utils/systemd-notify/notify.c            | 16 ++++++++--------
 src/grp-utils/systemd-path/Makefile              |  2 +-
 src/grp-utils/systemd-path/path.c                | 10 +++++-----
 src/grp-utils/systemd-path/sd-path.c             | 20 ++++++++++----------
 src/grp-utils/systemd-socket-activate/activate.c | 18 +++++++++---------
 7 files changed, 39 insertions(+), 39 deletions(-)

(limited to 'src/grp-utils')

diff --git a/src/grp-utils/systemd-ac-power/ac-power.c b/src/grp-utils/systemd-ac-power/ac-power.c
index 945c318f66..4b9190f8c9 100644
--- a/src/grp-utils/systemd-ac-power/ac-power.c
+++ b/src/grp-utils/systemd-ac-power/ac-power.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/util.h"
+#include "systemd-basic/util.h"
 
 int main(int argc, char *argv[]) {
         int r;
diff --git a/src/grp-utils/systemd-escape/escape.c b/src/grp-utils/systemd-escape/escape.c
index 479ea0e87c..5e186d75e2 100644
--- a/src/grp-utils/systemd-escape/escape.c
+++ b/src/grp-utils/systemd-escape/escape.c
@@ -21,11 +21,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/unit-name.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/unit-name.h"
 
 static enum {
         ACTION_ESCAPE,
diff --git a/src/grp-utils/systemd-notify/notify.c b/src/grp-utils/systemd-notify/notify.c
index 4db49508b3..c347c110a9 100644
--- a/src/grp-utils/systemd-notify/notify.c
+++ b/src/grp-utils/systemd-notify/notify.c
@@ -25,14 +25,14 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/env-util.h"
-#include "basic/formats-util.h"
-#include "basic/log.h"
-#include "basic/parse-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/env-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 
 static bool arg_ready = false;
 static pid_t arg_pid = 0;
diff --git a/src/grp-utils/systemd-path/Makefile b/src/grp-utils/systemd-path/Makefile
index 9fcae47938..d8abf0f2ee 100644
--- a/src/grp-utils/systemd-path/Makefile
+++ b/src/grp-utils/systemd-path/Makefile
@@ -30,7 +30,7 @@ systemd_path_SOURCES = \
 	src/path/path.c
 
 systemd_path_LDADD = \
-	libbasic.la
+	libsystemd-basic.la
 
 sd.CPPFLAGS += -DLIBDIR=\"$(libdir)\"
 sd.CPPFLAGS += -DROOTLIBDIR=\"$(rootlibdir)\"
diff --git a/src/grp-utils/systemd-path/path.c b/src/grp-utils/systemd-path/path.c
index ed824fa857..3c5323862f 100644
--- a/src/grp-utils/systemd-path/path.c
+++ b/src/grp-utils/systemd-path/path.c
@@ -22,11 +22,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "basic/alloc-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 
 #include "sd-path.h"
 
diff --git a/src/grp-utils/systemd-path/sd-path.c b/src/grp-utils/systemd-path/sd-path.c
index 2e0a0a7cfd..b36bc34e58 100644
--- a/src/grp-utils/systemd-path/sd-path.c
+++ b/src/grp-utils/systemd-path/sd-path.c
@@ -17,16 +17,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/architecture.h"
-#include "basic/fd-util.h"
-#include "basic/fileio.h"
-#include "basic/missing.h"
-#include "basic/path-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/architecture.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/user-util.h"
+#include "systemd-basic/util.h"
 
 #include "sd-path.h"
 
diff --git a/src/grp-utils/systemd-socket-activate/activate.c b/src/grp-utils/systemd-socket-activate/activate.c
index 2ad205af17..35a51b2fcc 100644
--- a/src/grp-utils/systemd-socket-activate/activate.c
+++ b/src/grp-utils/systemd-socket-activate/activate.c
@@ -26,15 +26,15 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/escape.h"
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/macro.h"
-#include "basic/signal-util.h"
-#include "basic/socket-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/escape.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/macro.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
 
 static char** arg_listen = NULL;
 static bool arg_accept = false;
-- 
cgit v1.2.3-54-g00ecf