From 3bcaf458f6d823f81399dfbc6fcd452d54c1cd32 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 31 Mar 2017 22:49:02 -0400 Subject: [PATCH] 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. --- Makefile.am | 6 +++--- src/{libsystemd/sd-bus => busctl}/busctl-introspect.c | 0 src/{libsystemd/sd-bus => busctl}/busctl-introspect.h | 0 src/{libsystemd/sd-bus => busctl}/busctl.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename src/{libsystemd/sd-bus => busctl}/busctl-introspect.c (100%) rename src/{libsystemd/sd-bus => busctl}/busctl-introspect.h (100%) rename src/{libsystemd/sd-bus => busctl}/busctl.c (100%) 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 similarity index 100% rename from src/libsystemd/sd-bus/busctl-introspect.c rename to src/busctl/busctl-introspect.c diff --git a/src/libsystemd/sd-bus/busctl-introspect.h b/src/busctl/busctl-introspect.h similarity index 100% rename from src/libsystemd/sd-bus/busctl-introspect.h rename to src/busctl/busctl-introspect.h diff --git a/src/libsystemd/sd-bus/busctl.c b/src/busctl/busctl.c similarity index 100% rename from src/libsystemd/sd-bus/busctl.c rename to src/busctl/busctl.c -- 2.25.1