From c570e09ac9d99abd0c134b60c5defd97083d46ec Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 24 May 2018 12:33:14 +0200 Subject: [PATCH] common: Rename all generated files to *-dbus-generated.[ch] Easier to spot them this way Closes: #1706 Approved by: alexlarsson --- .gitignore | 4 +--- app/flatpak-builtins-document-export.c | 2 +- app/flatpak-builtins-document-info.c | 2 +- app/flatpak-builtins-document-list.c | 2 +- app/flatpak-builtins-document-unexport.c | 2 +- app/flatpak-builtins-enter.c | 2 +- app/flatpak-builtins-run.c | 2 +- common/Makefile.am.inc | 18 +++++++++--------- common/flatpak-context.c | 2 +- common/flatpak-exports.c | 2 +- common/flatpak-run.c | 4 ++-- common/flatpak-utils-private.h | 4 ++-- session-helper/flatpak-session-helper.c | 2 +- system-helper/flatpak-system-helper.c | 2 +- 14 files changed, 24 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 04cd5979..51d4ce70 100644 --- a/.gitignore +++ b/.gitignore @@ -36,9 +36,7 @@ flatpak-session-helper flatpak-portal *~ profile/flatpak.sh -flatpak-dbus.[ch] -flatpak-document-dbus.[ch] -flatpak-systemd-dbus.[ch] +*-dbus-generated.[ch] flatpak-resources.[ch] flatpak-portal-dbus.[ch] flatpak-dbus-proxy diff --git a/app/flatpak-builtins-document-export.c b/app/flatpak-builtins-document-export.c index d67f60d5..015aa133 100644 --- a/app/flatpak-builtins-document-export.c +++ b/app/flatpak-builtins-document-export.c @@ -29,7 +29,7 @@ #include #include "libglnx/libglnx.h" -#include "flatpak-document-dbus.h" +#include "flatpak-document-dbus-generated.h" #include diff --git a/app/flatpak-builtins-document-info.c b/app/flatpak-builtins-document-info.c index 8c8af2ac..4b94433d 100644 --- a/app/flatpak-builtins-document-info.c +++ b/app/flatpak-builtins-document-info.c @@ -29,7 +29,7 @@ #include #include "libglnx/libglnx.h" -#include "flatpak-document-dbus.h" +#include "flatpak-document-dbus-generated.h" #include diff --git a/app/flatpak-builtins-document-list.c b/app/flatpak-builtins-document-list.c index 2754f7a6..be61ff18 100644 --- a/app/flatpak-builtins-document-list.c +++ b/app/flatpak-builtins-document-list.c @@ -29,7 +29,7 @@ #include #include "libglnx/libglnx.h" -#include "flatpak-document-dbus.h" +#include "flatpak-document-dbus-generated.h" #include "flatpak-builtins.h" #include "flatpak-utils-private.h" diff --git a/app/flatpak-builtins-document-unexport.c b/app/flatpak-builtins-document-unexport.c index 267d5a26..0b108c82 100644 --- a/app/flatpak-builtins-document-unexport.c +++ b/app/flatpak-builtins-document-unexport.c @@ -29,7 +29,7 @@ #include #include "libglnx/libglnx.h" -#include "flatpak-document-dbus.h" +#include "flatpak-document-dbus-generated.h" #include diff --git a/app/flatpak-builtins-enter.c b/app/flatpak-builtins-enter.c index b9ad05aa..e91cefde 100644 --- a/app/flatpak-builtins-enter.c +++ b/app/flatpak-builtins-enter.c @@ -33,7 +33,7 @@ #include "flatpak-builtins.h" #include "flatpak-utils-private.h" -#include "flatpak-dbus.h" +#include "flatpak-dbus-generated.h" #include "flatpak-run-private.h" diff --git a/app/flatpak-builtins-run.c b/app/flatpak-builtins-run.c index 4b62011e..b949673c 100644 --- a/app/flatpak-builtins-run.c +++ b/app/flatpak-builtins-run.c @@ -34,7 +34,7 @@ #include "flatpak-builtins.h" #include "flatpak-utils-private.h" #include "flatpak-error.h" -#include "flatpak-dbus.h" +#include "flatpak-dbus-generated.h" #include "flatpak-run-private.h" static char *opt_arch; diff --git a/common/Makefile.am.inc b/common/Makefile.am.inc index a03f38e7..bb74d859 100644 --- a/common/Makefile.am.inc +++ b/common/Makefile.am.inc @@ -1,36 +1,36 @@ noinst_LTLIBRARIES += libflatpak-common.la -dbus_built_sources = common/flatpak-dbus.c common/flatpak-dbus.h common/flatpak-document-dbus.c common/flatpak-document-dbus.h -systemd_dbus_built_sources = common/flatpak-systemd-dbus.c common/flatpak-systemd-dbus.h +dbus_built_sources = common/flatpak-dbus-generated.c common/flatpak-dbus-generated.h common/flatpak-document-dbus-generated.c common/flatpak-document-dbus-generated.h +systemd_dbus_built_sources = common/flatpak-systemd-dbus-generated.c common/flatpak-systemd-dbus-generated.h -common/flatpak-dbus.c: data/org.freedesktop.Flatpak.xml Makefile +common/flatpak-dbus-generated.c: data/org.freedesktop.Flatpak.xml Makefile mkdir -p $(builddir)/common $(AM_V_GEN) $(GDBUS_CODEGEN) \ --interface-prefix org.freedesktop.Flatpak. \ --c-namespace Flatpak \ - --generate-c-code $(builddir)/common/flatpak-dbus \ + --generate-c-code $(builddir)/common/flatpak-dbus-generated \ $(srcdir)/data/org.freedesktop.Flatpak.xml \ $(NULL) -common/flatpak-document-dbus.c: data/org.freedesktop.portal.Documents.xml Makefile +common/flatpak-document-dbus-generated.c: data/org.freedesktop.portal.Documents.xml Makefile mkdir -p $(builddir)/common $(AM_V_GEN) $(GDBUS_CODEGEN) \ --interface-prefix org.freedesktop.portal. \ --c-namespace XdpDbus \ - --generate-c-code $(builddir)/common/flatpak-document-dbus \ + --generate-c-code $(builddir)/common/flatpak-document-dbus-generated \ $(srcdir)/data/org.freedesktop.portal.Documents.xml \ $(NULL) -common/flatpak-systemd-dbus.c: data/org.freedesktop.systemd1.xml Makefile +common/flatpak-systemd-dbus-generated.c: data/org.freedesktop.systemd1.xml Makefile mkdir -p $(builddir)/common $(AM_V_GEN) $(GDBUS_CODEGEN) \ --interface-prefix org.freedesktop.systemd1. \ --c-namespace Systemd \ - --generate-c-code $(builddir)/common/flatpak-systemd-dbus \ + --generate-c-code $(builddir)/common/flatpak-systemd-dbus-generated \ $(srcdir)/data/org.freedesktop.systemd1.xml \ $(NULL) -common/%-dbus.h: common/%-dbus.c +common/%-dbus-generated.h: common/%-dbus-generated.c @true # Built as a side-effect of the rules for the .c nodist_libflatpak_common_la_SOURCES = \ diff --git a/common/flatpak-context.c b/common/flatpak-context.c index bf1ddf4a..b7af8049 100644 --- a/common/flatpak-context.c +++ b/common/flatpak-context.c @@ -41,7 +41,7 @@ #include "flatpak-proxy.h" #include "flatpak-utils-private.h" #include "flatpak-dir-private.h" -#include "flatpak-systemd-dbus.h" +#include "flatpak-systemd-dbus-generated.h" #include "lib/flatpak-error.h" /* Same order as enum */ diff --git a/common/flatpak-exports.c b/common/flatpak-exports.c index 28f0c3c1..af6d5ea9 100644 --- a/common/flatpak-exports.c +++ b/common/flatpak-exports.c @@ -45,7 +45,7 @@ #include "flatpak-proxy.h" #include "flatpak-utils-private.h" #include "flatpak-dir-private.h" -#include "flatpak-systemd-dbus.h" +#include "flatpak-systemd-dbus-generated.h" #include "lib/flatpak-error.h" /* We don't want to export paths pointing into these, because they are readonly diff --git a/common/flatpak-run.c b/common/flatpak-run.c index 89dc0704..21c5f5ec 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c @@ -50,8 +50,8 @@ #include "flatpak-proxy.h" #include "flatpak-utils-private.h" #include "flatpak-dir-private.h" -#include "flatpak-systemd-dbus.h" -#include "flatpak-document-dbus.h" +#include "flatpak-systemd-dbus-generated.h" +#include "flatpak-document-dbus-generated.h" #include "lib/flatpak-error.h" #define DEFAULT_SHELL "/bin/sh" diff --git a/common/flatpak-utils-private.h b/common/flatpak-utils-private.h index 01e529d9..8226dbb9 100644 --- a/common/flatpak-utils-private.h +++ b/common/flatpak-utils-private.h @@ -28,8 +28,8 @@ #include #include #include -#include "flatpak-dbus.h" -#include "flatpak-document-dbus.h" +#include "flatpak-dbus-generated.h" +#include "flatpak-document-dbus-generated.h" #include "flatpak-context-private.h" #include #include diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c index b1293db6..eaac6d7c 100644 --- a/session-helper/flatpak-session-helper.c +++ b/session-helper/flatpak-session-helper.c @@ -27,7 +27,7 @@ #include #include #include -#include "flatpak-dbus.h" +#include "flatpak-dbus-generated.h" #include "flatpak-utils-private.h" static char *monitor_dir; diff --git a/system-helper/flatpak-system-helper.c b/system-helper/flatpak-system-helper.c index b7016cc4..6692928e 100644 --- a/system-helper/flatpak-system-helper.c +++ b/system-helper/flatpak-system-helper.c @@ -26,7 +26,7 @@ #include #include -#include "flatpak-dbus.h" +#include "flatpak-dbus-generated.h" #include "flatpak-dir-private.h" #include "flatpak-oci-registry-private.h" #include "lib/flatpak-error.h"