summaryrefslogtreecommitdiff
path: root/src/libudev
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-07-27 21:09:48 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-07-27 21:09:48 -0400
commite2582041327daab7590c369e99988ab4c827a77b (patch)
tree6946476c40adf51bc7a9f84071a3373a89af25a0 /src/libudev
parentea373df773e0e8184a4b3f8ffff3bb43f307cde9 (diff)
fix (mostly adjust #includes to have sd- prefix)
Diffstat (limited to 'src/libudev')
-rw-r--r--src/libudev/src/Makefile2
-rw-r--r--src/libudev/src/libudev-device-private.c2
-rw-r--r--src/libudev/src/libudev-device.c4
-rw-r--r--src/libudev/src/libudev-enumerate.c4
-rw-r--r--src/libudev/src/libudev-hwdb.c2
5 files changed, 6 insertions, 8 deletions
diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile
index 6628ec6253..77fc1fe6aa 100644
--- a/src/libudev/src/Makefile
+++ b/src/libudev/src/Makefile
@@ -80,8 +80,6 @@ test_libudev_sym_CFLAGS = \
test_libudev_sym_LDADD = \
libudev.la
-systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-device
-systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-hwdb
systemd.sed_files += libudev.pc
include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libudev/src/libudev-device-private.c b/src/libudev/src/libudev-device-private.c
index 2aae0726c1..bd18d60c1e 100644
--- a/src/libudev/src/libudev-device-private.c
+++ b/src/libudev/src/libudev-device-private.c
@@ -20,7 +20,7 @@
#include "libudev.h"
-#include "device-private.h"
+#include "sd-device/device-private.h"
#include "libudev-device-internal.h"
#include "libudev-private.h"
diff --git a/src/libudev/src/libudev-device.c b/src/libudev/src/libudev-device.c
index 6536f4cfbb..6bf2e87189 100644
--- a/src/libudev/src/libudev-device.c
+++ b/src/libudev/src/libudev-device.c
@@ -38,8 +38,8 @@
#include <systemd/sd-device.h>
#include "alloc-util.h"
-#include "device-private.h"
-#include "device-util.h"
+#include "sd-device/device-private.h"
+#include "sd-device/device-util.h"
#include "libudev-device-internal.h"
#include "libudev-private.h"
#include "parse-util.h"
diff --git a/src/libudev/src/libudev-enumerate.c b/src/libudev/src/libudev-enumerate.c
index 9910cea957..ad6b3a9778 100644
--- a/src/libudev/src/libudev-enumerate.c
+++ b/src/libudev/src/libudev-enumerate.c
@@ -32,8 +32,8 @@
#include <systemd/sd-device.h>
#include "alloc-util.h"
-#include "device-enumerator-private.h"
-#include "device-util.h"
+#include "sd-device/device-enumerator-private.h"
+#include "sd-device/device-util.h"
#include "libudev-device-internal.h"
/**
diff --git a/src/libudev/src/libudev-hwdb.c b/src/libudev/src/libudev-hwdb.c
index 8c4b488086..d671484156 100644
--- a/src/libudev/src/libudev-hwdb.c
+++ b/src/libudev/src/libudev-hwdb.c
@@ -20,7 +20,7 @@
#include <systemd/sd-hwdb.h>
#include "alloc-util.h"
-#include "hwdb-util.h"
+#include "sd-hwdb/hwdb-util.h"
#include "libudev-private.h"
/**