summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-06-06 20:35:58 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-06-06 20:35:58 -0400
commitfd12a16be4789c09afc9d6272cbd1a5382c87401 (patch)
tree1f020e3b80d83ea9200ad4a5bc13251373aeca64
parenta63f799a64a93e91c4d2e94514f2b480a68bacf6 (diff)
busctl
-rw-r--r--src/busctl/Makefile5
-rw-r--r--src/busctl/busctl-introspect.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/busctl-introspect.c)0
-rw-r--r--src/busctl/busctl-introspect.h (renamed from src/libsystemd/libsystemd-internal/sd-bus/busctl-introspect.h)0
-rw-r--r--src/busctl/busctl.c (renamed from src/libsystemd/libsystemd-internal/sd-bus/busctl.c)0
4 files changed, 4 insertions, 1 deletions
diff --git a/src/busctl/Makefile b/src/busctl/Makefile
index f547759ad9..d7221f9dcd 100644
--- a/src/busctl/Makefile
+++ b/src/busctl/Makefile
@@ -168,7 +168,10 @@ busctl_SOURCES = \
src/libsystemd/sd-bus/busctl-introspect.h
busctl_LDADD = \
- libshared.la
+ $(topoutdir)/src/libshared/libshared.la
$(eval $(value automake2autothing))
+AM_CPPFLAGS += $(libshared.CPPFLAGS)
+AM_CPPFLAGS += $(libbasic.CPPFLAGS)
+AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/libsystemd-internal/sd-bus/busctl-introspect.c b/src/busctl/busctl-introspect.c
index 3c49ad5c57..3c49ad5c57 100644
--- a/src/libsystemd/libsystemd-internal/sd-bus/busctl-introspect.c
+++ b/src/busctl/busctl-introspect.c
diff --git a/src/libsystemd/libsystemd-internal/sd-bus/busctl-introspect.h b/src/busctl/busctl-introspect.h
index d922e352db..d922e352db 100644
--- a/src/libsystemd/libsystemd-internal/sd-bus/busctl-introspect.h
+++ b/src/busctl/busctl-introspect.h
diff --git a/src/libsystemd/libsystemd-internal/sd-bus/busctl.c b/src/busctl/busctl.c
index fd3b241aad..fd3b241aad 100644
--- a/src/libsystemd/libsystemd-internal/sd-bus/busctl.c
+++ b/src/busctl/busctl.c