diff --git a/Makefile-rpm-ostree.am b/Makefile-rpm-ostree.am index 62318212..9e90093d 100644 --- a/Makefile-rpm-ostree.am +++ b/Makefile-rpm-ostree.am @@ -48,8 +48,8 @@ librpmostreeinternals_la_SOURCES = \ src/app/rpmostree-db-builtin-diff.cxx \ src/app/rpmostree-db-builtin-list.cxx \ src/app/rpmostree-db-builtin-version.cxx \ - src/app/rpmostree-dbus-helpers.cxx \ - src/app/rpmostree-dbus-helpers.h \ + src/app/rpmostree-clientlib.cxx \ + src/app/rpmostree-clientlib.h \ src/app/rpmostree-override-builtins.h \ src/app/rpmostree-override-builtins.cxx \ src/app/rpmostree-libbuiltin.cxx \ diff --git a/src/app/rpmostree-builtin-applylive.cxx b/src/app/rpmostree-builtin-applylive.cxx index bbb15464..9b8d9524 100644 --- a/src/app/rpmostree-builtin-applylive.cxx +++ b/src/app/rpmostree-builtin-applylive.cxx @@ -25,7 +25,7 @@ #include "rpmostree-ex-builtins.h" #include "rpmostree-libbuiltin.h" -#include "rpmostree-dbus-helpers.h" +#include "rpmostree-clientlib.h" #include "rpmostree-cxxrs.h" #include diff --git a/src/app/rpmostree-builtin-cancel.cxx b/src/app/rpmostree-builtin-cancel.cxx index d9d29a0d..b7747e04 100644 --- a/src/app/rpmostree-builtin-cancel.cxx +++ b/src/app/rpmostree-builtin-cancel.cxx @@ -26,7 +26,7 @@ #include "rpmostree-builtins.h" #include "rpmostree-util.h" #include "rpmostree-libbuiltin.h" -#include "rpmostree-dbus-helpers.h" +#include "rpmostree-clientlib.h" #include diff --git a/src/app/rpmostree-builtin-cleanup.cxx b/src/app/rpmostree-builtin-cleanup.cxx index c9fcb7f3..96344468 100644 --- a/src/app/rpmostree-builtin-cleanup.cxx +++ b/src/app/rpmostree-builtin-cleanup.cxx @@ -26,7 +26,7 @@ #include "rpmostree-builtins.h" #include "rpmostree-util.h" #include "rpmostree-libbuiltin.h" -#include "rpmostree-dbus-helpers.h" +#include "rpmostree-clientlib.h" #include diff --git a/src/app/rpmostree-builtin-deploy.cxx b/src/app/rpmostree-builtin-deploy.cxx index a769ff42..afc44940 100644 --- a/src/app/rpmostree-builtin-deploy.cxx +++ b/src/app/rpmostree-builtin-deploy.cxx @@ -23,7 +23,7 @@ #include "rpmostree-builtins.h" #include "rpmostree-libbuiltin.h" #include "rpmostree-rpm-util.h" -#include "rpmostree-dbus-helpers.h" +#include "rpmostree-clientlib.h" #include diff --git a/src/app/rpmostree-builtin-initramfs-etc.cxx b/src/app/rpmostree-builtin-initramfs-etc.cxx index 5b323ade..c6b9fc37 100644 --- a/src/app/rpmostree-builtin-initramfs-etc.cxx +++ b/src/app/rpmostree-builtin-initramfs-etc.cxx @@ -25,7 +25,7 @@ #include "rpmostree-ex-builtins.h" #include "rpmostree-libbuiltin.h" -#include "rpmostree-dbus-helpers.h" +#include "rpmostree-clientlib.h" #include diff --git a/src/app/rpmostree-builtin-initramfs.cxx b/src/app/rpmostree-builtin-initramfs.cxx index 1daf0235..b5bdae5b 100644 --- a/src/app/rpmostree-builtin-initramfs.cxx +++ b/src/app/rpmostree-builtin-initramfs.cxx @@ -25,7 +25,7 @@ #include "rpmostree-builtins.h" #include "rpmostree-libbuiltin.h" -#include "rpmostree-dbus-helpers.h" +#include "rpmostree-clientlib.h" #include diff --git a/src/app/rpmostree-builtin-kargs.cxx b/src/app/rpmostree-builtin-kargs.cxx index a698e077..f7fde787 100644 --- a/src/app/rpmostree-builtin-kargs.cxx +++ b/src/app/rpmostree-builtin-kargs.cxx @@ -22,7 +22,7 @@ #include "rpmostree-ex-builtins.h" #include "rpmostree-libbuiltin.h" -#include "rpmostree-dbus-helpers.h" +#include "rpmostree-clientlib.h" #include "rpmostree-editor.h" #include "rpmostree-util.h" #include diff --git a/src/app/rpmostree-builtin-rebase.cxx b/src/app/rpmostree-builtin-rebase.cxx index 5072f2a2..cf475b9b 100644 --- a/src/app/rpmostree-builtin-rebase.cxx +++ b/src/app/rpmostree-builtin-rebase.cxx @@ -27,7 +27,7 @@ #include "rpmostree-util.h" #include "rpmostree-core.h" #include "rpmostree-libbuiltin.h" -#include "rpmostree-dbus-helpers.h" +#include "rpmostree-clientlib.h" #include diff --git a/src/app/rpmostree-builtin-refresh-md.cxx b/src/app/rpmostree-builtin-refresh-md.cxx index 27070b55..92382574 100644 --- a/src/app/rpmostree-builtin-refresh-md.cxx +++ b/src/app/rpmostree-builtin-refresh-md.cxx @@ -24,7 +24,7 @@ #include "rpmostree-builtins.h" #include "rpmostree-util.h" #include "rpmostree-libbuiltin.h" -#include "rpmostree-dbus-helpers.h" +#include "rpmostree-clientlib.h" #include diff --git a/src/app/rpmostree-builtin-reset.cxx b/src/app/rpmostree-builtin-reset.cxx index 12112a24..0e006024 100644 --- a/src/app/rpmostree-builtin-reset.cxx +++ b/src/app/rpmostree-builtin-reset.cxx @@ -26,7 +26,7 @@ #include "rpmostree-ex-builtins.h" #include "rpmostree-util.h" #include "rpmostree-libbuiltin.h" -#include "rpmostree-dbus-helpers.h" +#include "rpmostree-clientlib.h" #include diff --git a/src/app/rpmostree-builtin-rollback.cxx b/src/app/rpmostree-builtin-rollback.cxx index d2dd2284..30f650c5 100644 --- a/src/app/rpmostree-builtin-rollback.cxx +++ b/src/app/rpmostree-builtin-rollback.cxx @@ -25,7 +25,7 @@ #include "rpmostree-builtins.h" #include "rpmostree-libbuiltin.h" -#include "rpmostree-dbus-helpers.h" +#include "rpmostree-clientlib.h" #include diff --git a/src/app/rpmostree-builtin-status.cxx b/src/app/rpmostree-builtin-status.cxx index 6b63c282..91a563ef 100644 --- a/src/app/rpmostree-builtin-status.cxx +++ b/src/app/rpmostree-builtin-status.cxx @@ -32,7 +32,7 @@ #include "rpmostree-ex-builtins.h" #include "rpmostree-libbuiltin.h" #include "rpmostreed-transaction-types.h" -#include "rpmostree-dbus-helpers.h" +#include "rpmostree-clientlib.h" #include "rpmostree-util.h" #include "rpmostree-core.h" #include "rpmostree-rpm-util.h" diff --git a/src/app/rpmostree-builtin-upgrade.cxx b/src/app/rpmostree-builtin-upgrade.cxx index 00284bbe..1abbf3b1 100644 --- a/src/app/rpmostree-builtin-upgrade.cxx +++ b/src/app/rpmostree-builtin-upgrade.cxx @@ -27,7 +27,7 @@ #include "rpmostree-builtins.h" #include "rpmostree-libbuiltin.h" #include "rpmostree-rpm-util.h" -#include "rpmostree-dbus-helpers.h" +#include "rpmostree-clientlib.h" #include diff --git a/src/app/rpmostree-builtins.h b/src/app/rpmostree-builtins.h index dffd89df..de23e2b9 100644 --- a/src/app/rpmostree-builtins.h +++ b/src/app/rpmostree-builtins.h @@ -22,7 +22,7 @@ #include "ostree.h" #include "rpmostree-builtin-types.h" -#include "rpmostree-dbus-helpers.h" +#include "rpmostree-clientlib.h" G_BEGIN_DECLS diff --git a/src/app/rpmostree-dbus-helpers.cxx b/src/app/rpmostree-clientlib.cxx similarity index 99% rename from src/app/rpmostree-dbus-helpers.cxx rename to src/app/rpmostree-clientlib.cxx index c9a06777..85bce91a 100644 --- a/src/app/rpmostree-dbus-helpers.cxx +++ b/src/app/rpmostree-clientlib.cxx @@ -32,7 +32,7 @@ #include #include "rpmostree-types.h" -#include "rpmostree-dbus-helpers.h" +#include "rpmostree-clientlib.h" #include "rpmostree-builtins.h" #include "rpmostree-libbuiltin.h" #include "rpmostree-util.h" diff --git a/src/app/rpmostree-dbus-helpers.h b/src/app/rpmostree-clientlib.h similarity index 100% rename from src/app/rpmostree-dbus-helpers.h rename to src/app/rpmostree-clientlib.h diff --git a/src/app/rpmostree-pkg-builtins.cxx b/src/app/rpmostree-pkg-builtins.cxx index 7bf8f54f..e9e5ec5b 100644 --- a/src/app/rpmostree-pkg-builtins.cxx +++ b/src/app/rpmostree-pkg-builtins.cxx @@ -23,7 +23,7 @@ #include "rpmostree-builtins.h" #include "rpmostree-libbuiltin.h" #include "rpmostree-rpm-util.h" -#include "rpmostree-dbus-helpers.h" +#include "rpmostree-clientlib.h" #include