mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-04-04 15:15:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

common: Rename all generated files to *-dbus-generated.[ch]

Browse Source 
Easier to spot them this way

Closes: #1706
Approved by: alexlarsson
This commit is contained in:
Alexander Larsson
2018-05-24 12:33:14 +02:00
committed by Atomic Bot
parent 7c17e77e84
commit c570e09ac9
14 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -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

2
app/flatpak-builtins-document-export.c
View File

@@ -29,7 +29,7 @@
#include <glib/gi18n.h>
#include "libglnx/libglnx.h"
#include "flatpak-document-dbus.h"
#include "flatpak-document-dbus-generated.h"
#include <gio/gunixfdlist.h>

2
app/flatpak-builtins-document-info.c
View File

@@ -29,7 +29,7 @@
#include <glib/gi18n.h>
#include "libglnx/libglnx.h"
#include "flatpak-document-dbus.h"
#include "flatpak-document-dbus-generated.h"
#include <gio/gunixfdlist.h>

2
app/flatpak-builtins-document-list.c
View File

@@ -29,7 +29,7 @@
#include <glib/gi18n.h>
#include "libglnx/libglnx.h"
#include "flatpak-document-dbus.h"
#include "flatpak-document-dbus-generated.h"
#include "flatpak-builtins.h"
#include "flatpak-utils-private.h"

2
app/flatpak-builtins-document-unexport.c
View File

@@ -29,7 +29,7 @@
#include <glib/gi18n.h>
#include "libglnx/libglnx.h"
#include "flatpak-document-dbus.h"
#include "flatpak-document-dbus-generated.h"
#include <gio/gunixfdlist.h>

2
app/flatpak-builtins-enter.c
View File

@@ -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"

2
app/flatpak-builtins-run.c
View File

@@ -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;

18
common/Makefile.am.inc
View File

@@ -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 = \

2
common/flatpak-context.c
View File

@@ -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 */

2
common/flatpak-exports.c
View File

@@ -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

4
common/flatpak-run.c
View File

@@ -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"

4
common/flatpak-utils-private.h
View File

@@ -28,8 +28,8 @@
#include <gio/gio.h>
#include <gio/gunixfdlist.h>
#include <libsoup/soup.h>
#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 <ostree.h>
#include <json-glib/json-glib.h>

2
session-helper/flatpak-session-helper.c
View File

@@ -27,7 +27,7 @@
#include <sys/ioctl.h>
#include <gio/gio.h>
#include <gio/gunixfdlist.h>
#include "flatpak-dbus.h"
#include "flatpak-dbus-generated.h"
#include "flatpak-utils-private.h"
static char *monitor_dir;

2
system-helper/flatpak-system-helper.c
View File

@@ -26,7 +26,7 @@
#include <gio/gio.h>
#include <polkit/polkit.h>
#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"