summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-03-31 22:49:02 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-04-04 20:36:09 -0400
commit3bcaf458f6d823f81399dfbc6fcd452d54c1cd32 (patch)
treea7496b87290b42fe3b1a4c345a33b5b5800450c0
parentb0b46a2c12c4ba04ea2425d7930b14ca48bc6545 (diff)
Move busctl sources to src/busctl
busctl is not part of libsystemd, and should not be stored under libsystemd. In particular this is confusing because busctl is linked with libshared, but stuff in libsystemd is not supposed to depend on libshared.
-rw-r--r--Makefile.am6
-rw-r--r--src/busctl/busctl-introspect.c (renamed from src/libsystemd/sd-bus/busctl-introspect.c)0
-rw-r--r--src/busctl/busctl-introspect.h (renamed from src/libsystemd/sd-bus/busctl-introspect.h)0
-rw-r--r--src/busctl/busctl.c (renamed from src/libsystemd/sd-bus/busctl.c)0
4 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 1cc657acca..4da0642076 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3610,9 +3610,9 @@ test_resolve_LDADD = \
libsystemd-shared.la
busctl_SOURCES = \
- src/libsystemd/sd-bus/busctl.c \
- src/libsystemd/sd-bus/busctl-introspect.c \
- src/libsystemd/sd-bus/busctl-introspect.h
+ src/busctl/busctl.c \
+ src/busctl/busctl-introspect.c \
+ src/busctl/busctl-introspect.h
busctl_LDADD = \
libsystemd-shared.la
diff --git a/src/libsystemd/sd-bus/busctl-introspect.c b/src/busctl/busctl-introspect.c
index a05794941f..a05794941f 100644
--- a/src/libsystemd/sd-bus/busctl-introspect.c
+++ b/src/busctl/busctl-introspect.c
diff --git a/src/libsystemd/sd-bus/busctl-introspect.h b/src/busctl/busctl-introspect.h
index d922e352db..d922e352db 100644
--- a/src/libsystemd/sd-bus/busctl-introspect.h
+++ b/src/busctl/busctl-introspect.h
diff --git a/src/libsystemd/sd-bus/busctl.c b/src/busctl/busctl.c
index 9dd3828364..9dd3828364 100644
--- a/src/libsystemd/sd-bus/busctl.c
+++ b/src/busctl/busctl.c