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/libshared | |
| parent | ea373df773e0e8184a4b3f8ffff3bb43f307cde9 (diff) | |
fix (mostly adjust #includes to have sd- prefix)
Diffstat (limited to 'src/libshared')
| -rw-r--r-- | src/libshared/Makefile | 6 | ||||
| -rw-r--r-- | src/libshared/bus-unit-util.c | 2 | ||||
| -rw-r--r-- | src/libshared/bus-util.c | 4 | ||||
| -rw-r--r-- | src/libshared/logs-show.c | 2 |
4 files changed, 4 insertions, 10 deletions
diff --git a/src/libshared/Makefile b/src/libshared/Makefile index 052865e882..914b38868f 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -27,8 +27,6 @@ noinst_LTLIBRARIES += \ libshared.la libshared_la_SOURCES = \ - src/libsystemd/sd-netlink/local-addresses.h \ - src/libsystemd/sd-netlink/local-addresses.c \ src/shared/output-mode.h \ src/shared/output-mode.c \ src/shared/gpt.h \ @@ -136,7 +134,6 @@ libshared_la_CFLAGS = \ libshared_la_LIBADD = \ libsystemd-internal.la \ - libsystemd-journal-internal.la \ libudev-internal.la \ $(ACL_LIBS) \ $(LIBIDN_LIBS) \ @@ -148,9 +145,6 @@ test_local_addresses_SOURCES = \ test_local_addresses_LDADD = \ libshared.la -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus - systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" systemd.CPPFLAGS += -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" diff --git a/src/libshared/bus-unit-util.c b/src/libshared/bus-unit-util.c index f68c4a41ac..dcd045eddd 100644 --- a/src/libshared/bus-unit-util.c +++ b/src/libshared/bus-unit-util.c @@ -18,7 +18,7 @@ ***/ #include "alloc-util.h" -#include "bus-internal.h" +#include "sd-bus/bus-internal.h" #include "bus-unit-util.h" #include "bus-util.h" #include "cgroup-util.h" diff --git a/src/libshared/bus-util.c b/src/libshared/bus-util.c index 62b5585e84..62c77a565a 100644 --- a/src/libshared/bus-util.c +++ b/src/libshared/bus-util.c @@ -35,9 +35,9 @@ #include <systemd/sd-id128.h> #include "alloc-util.h" -#include "bus-internal.h" +#include "sd-bus/bus-internal.h" #include "bus-label.h" -#include "bus-message.h" +#include "sd-bus/bus-message.h" #include "bus-util.h" #include "def.h" #include "escape.h" diff --git a/src/libshared/logs-show.c b/src/libshared/logs-show.c index 294fa3bede..97d0d2ffe4 100644 --- a/src/libshared/logs-show.c +++ b/src/libshared/logs-show.c @@ -37,7 +37,7 @@ #include "hashmap.h" #include "hostname-util.h" #include "io-util.h" -#include "journal-internal.h" +#include "sd-journal/journal-internal.h" #include "log.h" #include "logs-show.h" #include "macro.h" |