wip

11 files changed, 28 insertions, 28 deletions

diff --git a/src/grp-udev/udevadm/Makefile b/src/grp-udev/udevadm/Makefile
index b556d5c9d1..6c59baca19 100644
--- a/src/grp-udev/udevadm/Makefile
+++ b/src/grp-udev/udevadm/Makefile
@@ -41,7 +41,7 @@ udevadm_SOURCES = \
 
 udevadm_LDADD = \
 	libudev-core.la \
-	libbasic.la
+	libsystemd-basic.la
 
 sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
 
diff --git a/src/grp-udev/udevadm/udevadm-control.c b/src/grp-udev/udevadm/udevadm-control.c
index 8aaef5fa14..0b15e660da 100644
--- a/src/grp-udev/udevadm/udevadm-control.c
+++ b/src/grp-udev/udevadm/udevadm-control.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "shared/udev-util.h"
+#include "systemd-shared/udev-util.h"
 #include "udev.h"
 
 static void print_help(void) {
diff --git a/src/grp-udev/udevadm/udevadm-hwdb.c b/src/grp-udev/udevadm/udevadm-hwdb.c
index 2b5444f439..365f23fdff 100644
--- a/src/grp-udev/udevadm/udevadm-hwdb.c
+++ b/src/grp-udev/udevadm/udevadm-hwdb.c
@@ -22,17 +22,17 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "basic/alloc-util.h"
-#include "basic/conf-files.h"
-#include "basic/fileio.h"
-#include "basic/fs-util.h"
-#include "basic/label.h"
-#include "basic/mkdir.h"
-#include "basic/strbuf.h"
-#include "basic/string-util.h"
-#include "basic/util.h"
 #include "sd-hwdb/hwdb-internal.h"
 #include "sd-hwdb/hwdb-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/fileio.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/label.h"
+#include "systemd-basic/mkdir.h"
+#include "systemd-basic/strbuf.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
 #include "udev.h"
 
 /*
diff --git a/src/grp-udev/udevadm/udevadm-info.c b/src/grp-udev/udevadm/udevadm-info.c
index 9746d82aa4..38233de223 100644
--- a/src/grp-udev/udevadm/udevadm-info.c
+++ b/src/grp-udev/udevadm/udevadm-info.c
@@ -26,9 +26,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "basic/fd-util.h"
-#include "basic/string-util.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/udev-util.h"
 #include "udev.h"
 
 #include "udevadm-util.h"
diff --git a/src/grp-udev/udevadm/udevadm-monitor.c b/src/grp-udev/udevadm/udevadm-monitor.c
index c6002ce416..3503b19a21 100644
--- a/src/grp-udev/udevadm/udevadm-monitor.c
+++ b/src/grp-udev/udevadm/udevadm-monitor.c
@@ -25,9 +25,9 @@
 #include <sys/time.h>
 #include <time.h>
 
-#include "basic/fd-util.h"
-#include "basic/formats-util.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/formats-util.h"
+#include "systemd-shared/udev-util.h"
 #include "udev.h"
 
 static bool udev_exit;
diff --git a/src/grp-udev/udevadm/udevadm-settle.c b/src/grp-udev/udevadm/udevadm-settle.c
index 2a7a150517..1d2ee5ba26 100644
--- a/src/grp-udev/udevadm/udevadm-settle.c
+++ b/src/grp-udev/udevadm/udevadm-settle.c
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "basic/parse-util.h"
-#include "basic/util.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/util.h"
 #include "udev.h"
 
 static void help(void) {
diff --git a/src/grp-udev/udevadm/udevadm-test-builtin.c b/src/grp-udev/udevadm/udevadm-test-builtin.c
index a3a66e05d7..1f65b3ed8b 100644
--- a/src/grp-udev/udevadm/udevadm-test-builtin.c
+++ b/src/grp-udev/udevadm/udevadm-test-builtin.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "basic/string-util.h"
+#include "systemd-basic/string-util.h"
 #include "udev.h"
 
 static void help(struct udev *udev) {
diff --git a/src/grp-udev/udevadm/udevadm-test.c b/src/grp-udev/udevadm/udevadm-test.c
index ed919ec244..00b326d2cb 100644
--- a/src/grp-udev/udevadm/udevadm-test.c
+++ b/src/grp-udev/udevadm/udevadm-test.c
@@ -25,8 +25,8 @@
 #include <sys/signalfd.h>
 #include <unistd.h>
 
-#include "basic/string-util.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-shared/udev-util.h"
 #include "udev.h"
 
 static void help(void) {
diff --git a/src/grp-udev/udevadm/udevadm-trigger.c b/src/grp-udev/udevadm/udevadm-trigger.c
index 280f348fae..150b1e5a9a 100644
--- a/src/grp-udev/udevadm/udevadm-trigger.c
+++ b/src/grp-udev/udevadm/udevadm-trigger.c
@@ -23,9 +23,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "basic/string-util.h"
-#include "basic/util.h"
-#include "shared/udev-util.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/udev-util.h"
 #include "udev.h"
 
 #include "udevadm-util.h"
diff --git a/src/grp-udev/udevadm/udevadm-util.c b/src/grp-udev/udevadm/udevadm-util.c
index 8dc871cb10..c972959888 100644
--- a/src/grp-udev/udevadm/udevadm-util.c
+++ b/src/grp-udev/udevadm/udevadm-util.c
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "basic/string-util.h"
+#include "systemd-basic/string-util.h"
 
 #include "udevadm-util.h"
 
diff --git a/src/grp-udev/udevadm/udevadm.c b/src/grp-udev/udevadm/udevadm.c
index 555d269275..4f61722836 100644
--- a/src/grp-udev/udevadm/udevadm.c
+++ b/src/grp-udev/udevadm/udevadm.c
@@ -20,8 +20,8 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#include "basic/selinux-util.h"
-#include "basic/string-util.h"
+#include "systemd-basic/selinux-util.h"
+#include "systemd-basic/string-util.h"
 #include "udev.h"
 
 static int adm_version(struct udev *udev, int argc, char *argv[]) {