[gnome-flashback] audio-device-selection: move D-Bus interface files to libdbus

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 68eba534bea1f805794ce5e39dd7b2a6085feac1
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Dec 17 15:16:22 2019 +0200

    audio-device-selection: move D-Bus interface files to libdbus

 dbus/Makefile.am                                   |  9 +++++++
 .../org.gnome.Shell.AudioDeviceSelection.xml       |  1 +
 .../libaudio-device-selection/Makefile.am          | 28 +++-------------------
 .../gf-audio-device-selection.c                    |  4 ++--
 4 files changed, 15 insertions(+), 27 deletions(-)
---
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 424b6f9..cd49c04 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -39,6 +39,12 @@ gf-accounts-user-gen.c: org.freedesktop.Accounts.User.xml
                --generate-c-code gf-accounts-user-gen \
                $(srcdir)/org.freedesktop.Accounts.User.xml
 
+gf-audio-device-selection-gen.h:
+gf-audio-device-selection-gen.c: org.gnome.Shell.AudioDeviceSelection.xml
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
+               --generate-c-code gf-audio-device-selection-gen \
+               $(srcdir)/org.gnome.Shell.AudioDeviceSelection.xml
+
 gf-dm-seat-gen.h:
 gf-dm-seat-gen.c: org.freedesktop.DisplayManager.Seat.xml
        $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
@@ -146,6 +152,8 @@ BUILT_SOURCES = \
        gf-accounts-gen.h \
        gf-accounts-user-gen.c \
        gf-accounts-user-gen.h \
+       gf-audio-device-selection-gen.c \
+       gf-audio-device-selection-gen.h \
        gf-dm-seat-gen.c \
        gf-dm-seat-gen.h \
        gf-fd-application-gen.c \
@@ -197,6 +205,7 @@ EXTRA_DIST = \
        org.gnome.Nautilus.FileOperations.xml \
        org.gnome.ScreenSaver.xml \
        org.gnome.SessionManager.Presence.xml \
+       org.gnome.Shell.AudioDeviceSelection.xml \
        org.gnome.Shell.Screencast.xml \
        org.gnome.Shell.Screenshot.xml \
        org.gnome.Shell.xml \
diff --git a/gnome-flashback/libaudio-device-selection/org.gnome.Shell.AudioDeviceSelection.xml 
b/dbus/org.gnome.Shell.AudioDeviceSelection.xml
similarity index 86%
rename from gnome-flashback/libaudio-device-selection/org.gnome.Shell.AudioDeviceSelection.xml
rename to dbus/org.gnome.Shell.AudioDeviceSelection.xml
index 19f4c56..2034bcb 100644
--- a/gnome-flashback/libaudio-device-selection/org.gnome.Shell.AudioDeviceSelection.xml
+++ b/dbus/org.gnome.Shell.AudioDeviceSelection.xml
@@ -3,6 +3,7 @@
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";>
 <node>
   <interface name="org.gnome.Shell.AudioDeviceSelection">
+    <annotation name="org.gtk.GDBus.C.Name" value="AudioDeviceSelectionGen" />
 
     <method name="Close">
     </method>
diff --git a/gnome-flashback/libaudio-device-selection/Makefile.am 
b/gnome-flashback/libaudio-device-selection/Makefile.am
index 1ff410f..169532b 100644
--- a/gnome-flashback/libaudio-device-selection/Makefile.am
+++ b/gnome-flashback/libaudio-device-selection/Makefile.am
@@ -7,7 +7,8 @@ noinst_LTLIBRARIES = \
 libaudio_device_selection_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"audio-device-selection\" \
        -DG_LOG_USE_STRUCTURED=1 \
-       -I$(top_builddir)/gnome-flashback/libaudio-device-selection \
+       -I$(top_srcdir) \
+       $(AM_CPPFLAGS) \
        $(NULL)
 
 libaudio_device_selection_la_CFLAGS = \
@@ -21,7 +22,6 @@ libaudio_device_selection_la_SOURCES = \
        gf-audio-device-selection.h \
        gf-audio-device-selection-dialog.c \
        gf-audio-device-selection-dialog.h \
-       $(BUILT_SOURCES) \
        $(NULL)
 
 libaudio_device_selection_la_LDFLAGS = \
@@ -30,30 +30,8 @@ libaudio_device_selection_la_LDFLAGS = \
        $(NULL)
 
 libaudio_device_selection_la_LIBADD = \
+       $(top_builddir)/dbus/libdbus.la \
        $(AUDIO_DEVICE_SELECTION_LIBS) \
        $(NULL)
 
-gf-audio-device-selection-gen.h:
-gf-audio-device-selection-gen.c: org.gnome.Shell.AudioDeviceSelection.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) \
-               --interface-prefix org.gnome.Shell.AudioDeviceSelection. \
-               --generate-c-code gf-audio-device-selection-gen \
-               --c-namespace Gf \
-               --annotate "org.gnome.Shell.AudioDeviceSelection" \
-                          "org.gtk.GDBus.C.Name" AudioDeviceSelectionGen \
-               $(srcdir)/org.gnome.Shell.AudioDeviceSelection.xml
-
-BUILT_SOURCES = \
-       gf-audio-device-selection-gen.c \
-       gf-audio-device-selection-gen.h \
-       $(NULL)
-
-EXTRA_DIST = \
-       org.gnome.Shell.AudioDeviceSelection.xml \
-       $(NULL)
-
-CLEANFILES = \
-       $(BUILT_SOURCES) \
-       $(NULL)
-
 -include $(top_srcdir)/git.mk
diff --git a/gnome-flashback/libaudio-device-selection/gf-audio-device-selection.c 
b/gnome-flashback/libaudio-device-selection/gf-audio-device-selection.c
index eec6412..87ec91a 100644
--- a/gnome-flashback/libaudio-device-selection/gf-audio-device-selection.c
+++ b/gnome-flashback/libaudio-device-selection/gf-audio-device-selection.c
@@ -16,10 +16,10 @@
  */
 
 #include "config.h"
-
 #include "gf-audio-device-selection.h"
+
+#include "dbus/gf-audio-device-selection-gen.h"
 #include "gf-audio-device-selection-dialog.h"
-#include "gf-audio-device-selection-gen.h"
 
 #define AUDIO_DEVICE_SELECTION_DBUS_NAME "org.gnome.Shell.AudioDeviceSelection"
 #define AUDIO_DEVICE_SELECTION_DBUS_PATH "/org/gnome/Shell/AudioDeviceSelection"