diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-27 21:09:48 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-27 21:09:48 -0400 |
| commit | e2582041327daab7590c369e99988ab4c827a77b (patch) | |
| tree | 6946476c40adf51bc7a9f84071a3373a89af25a0 /src/grp-udev/libudev-core | |
| parent | ea373df773e0e8184a4b3f8ffff3bb43f307cde9 (diff) | |
fix (mostly adjust #includes to have sd- prefix)
Diffstat (limited to 'src/grp-udev/libudev-core')
| -rw-r--r-- | src/grp-udev/libudev-core/Makefile | 2 | ||||
| -rw-r--r-- | src/grp-udev/libudev-core/net/Makefile | 1 | ||||
| -rw-r--r-- | src/grp-udev/libudev-core/net/link-config.c | 2 | ||||
| l--------- | src/grp-udev/libudev-core/sd-login.c | 2 | ||||
| -rw-r--r-- | src/grp-udev/libudev-core/udev-builtin-hwdb.c | 2 | ||||
| -rw-r--r-- | src/grp-udev/libudev-core/udev-event.c | 2 |
6 files changed, 4 insertions, 7 deletions
diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile index 56efd36aa6..d47fbe3257 100644 --- a/src/grp-udev/libudev-core/Makefile +++ b/src/grp-udev/libudev-core/Makefile @@ -102,8 +102,6 @@ libudev-core.la.SOURCES = $(patsubst src/udev/%,%,$(filter %.c,$(_libudev_core_l libudev-core.la.DEPENDS = $(addprefix $(outdir)/,$(libudev-core.la.SOURCES:.c=.lo)) at.subdirs += net $(outdir)/udev-builtin-keyboard.lo: $(outdir)/keyboard-keys-from-name.h -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-netlink -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-hwdb systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/libudev-core/net/Makefile b/src/grp-udev/libudev-core/net/Makefile index 7ff2f40349..153afd5089 100644 --- a/src/grp-udev/libudev-core/net/Makefile +++ b/src/grp-udev/libudev-core/net/Makefile @@ -26,6 +26,5 @@ include $(topsrcdir)/build-aux/Makefile.head.mk systemd.CPPFLAGS += $(libshared.CPPFLAGS) systemd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-netlink include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/libudev-core/net/link-config.c b/src/grp-udev/libudev-core/net/link-config.c index 350cd24e9c..4582c8b90d 100644 --- a/src/grp-udev/libudev-core/net/link-config.c +++ b/src/grp-udev/libudev-core/net/link-config.c @@ -30,7 +30,7 @@ #include "link-config.h" #include "log.h" #include "missing.h" -#include "netlink-util.h" +#include "sd-netlink/netlink-util.h" #include "network-internal.h" #include "parse-util.h" #include "path-util.h" diff --git a/src/grp-udev/libudev-core/sd-login.c b/src/grp-udev/libudev-core/sd-login.c index 95a6042740..913dcedc6a 120000 --- a/src/grp-udev/libudev-core/sd-login.c +++ b/src/grp-udev/libudev-core/sd-login.c @@ -1 +1 @@ -../../libsystemd/libsystemd-internal/sd-login/sd-login.c
\ No newline at end of file +../../libsystemd/src/sd-login/sd-login.c
\ No newline at end of file diff --git a/src/grp-udev/libudev-core/udev-builtin-hwdb.c b/src/grp-udev/libudev-core/udev-builtin-hwdb.c index b96f39ba20..64790c31bb 100644 --- a/src/grp-udev/libudev-core/udev-builtin-hwdb.c +++ b/src/grp-udev/libudev-core/udev-builtin-hwdb.c @@ -25,7 +25,7 @@ #include <systemd/sd-hwdb.h> #include "alloc-util.h" -#include "hwdb-util.h" +#include "sd-hwdb/hwdb-util.h" #include "string-util.h" #include "udev-util.h" #include "udev.h" diff --git a/src/grp-udev/libudev-core/udev-event.c b/src/grp-udev/libudev-core/udev-event.c index 8d601c9c2c..2b79d24d31 100644 --- a/src/grp-udev/libudev-core/udev-event.c +++ b/src/grp-udev/libudev-core/udev-event.c @@ -33,7 +33,7 @@ #include "alloc-util.h" #include "fd-util.h" #include "formats-util.h" -#include "netlink-util.h" +#include "sd-netlink/netlink-util.h" #include "process-util.h" #include "signal-util.h" #include "string-util.h" |