[gnome-flashback/wip/muktupavels/test: 2/15] desktop: move D-Bus interface files to libdbus

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

commit eec5e9d7ee5b1ef94ab92f1928f863a0bc4f2825
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Dec 17 13:21:47 2019 +0200

    desktop: move D-Bus interface files to libdbus

 Makefile.am                                        |  1 +
 configure.ac                                       |  7 +++
 dbus/Makefile.am                                   | 58 ++++++++++++++++++++++
 .../org.freedesktop.FileManager1.xml               |  0
 .../org.gnome.Nautilus.FileOperations.xml          |  0
 gnome-flashback/libdesktop/Makefile.am             | 19 +------
 gnome-flashback/libdesktop/gf-icon-view.c          |  4 +-
 7 files changed, 69 insertions(+), 20 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7b81cd5..0c48de7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@ NULL =
 
 SUBDIRS = \
        data \
+       dbus \
        backends \
        gnome-flashback \
        po \
diff --git a/configure.ac b/configure.ac
index 3710430..e9b059f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,6 +99,11 @@ IBUS_REQUIRED=1.5.2
 UPOWER_GLIB_REQUIRED=0.99.0
 XRANDR_REQUIRED=1.5.0
 
+PKG_CHECK_MODULES([DBUS], [
+  gio-2.0 >= $GLIB_REQUIRED
+  gio-unix-2.0 >= $GLIB_REQUIRED
+])
+
 PKG_CHECK_MODULES([BACKENDS], [
   gio-2.0 >= $GLIB_REQUIRED
   gio-unix-2.0 >= $GLIB_REQUIRED
@@ -364,6 +369,8 @@ AC_CONFIG_FILES([
   data/ui/Makefile
   data/xsessions/Makefile
 
+  dbus/Makefile
+
   gnome-flashback/Makefile
   gnome-flashback/liba11y-keyboard/Makefile
   gnome-flashback/libaudio-device-selection/Makefile
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
new file mode 100644
index 0000000..e074bf7
--- /dev/null
+++ b/dbus/Makefile.am
@@ -0,0 +1,58 @@
+NULL =
+
+noinst_LTLIBRARIES = \
+       libdbus.la \
+       $(NULL)
+
+libdbus_la_CPPFLAGS = \
+       $(AM_CPPCFLAGS) \
+       $(NULL)
+
+libdbus_la_CFLAGS = \
+       $(DBUS_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+libdbus_la_SOURCES = \
+       $(BUILT_SOURCES) \
+       $(NULL)
+
+libdbus_la_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+libdbus_la_LIBADD = \
+       $(DBUS_LIBS) \
+       $(NULL)
+
+gf-file-manager-gen.h:
+gf-file-manager-gen.c: org.freedesktop.FileManager1.xml
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
+               --generate-c-code gf-file-manager-gen \
+               $(srcdir)/org.freedesktop.FileManager1.xml
+
+gf-nautilus-gen.h:
+gf-nautilus-gen.c: org.gnome.Nautilus.FileOperations.xml
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
+               --generate-c-code gf-nautilus-gen \
+               $(srcdir)/org.gnome.Nautilus.FileOperations.xml
+
+BUILT_SOURCES = \
+       gf-file-manager-gen.c \
+       gf-file-manager-gen.h \
+       gf-nautilus-gen.c \
+       gf-nautilus-gen.h \
+       $(NULL)
+
+EXTRA_DIST = \
+       org.freedesktop.FileManager1.xml \
+       org.gnome.Nautilus.FileOperations.xml \
+       $(NULL)
+
+CLEANFILES = \
+       $(BUILT_SOURCES) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/gnome-flashback/libdesktop/org.freedesktop.FileManager1.xml 
b/dbus/org.freedesktop.FileManager1.xml
similarity index 100%
rename from gnome-flashback/libdesktop/org.freedesktop.FileManager1.xml
rename to dbus/org.freedesktop.FileManager1.xml
diff --git a/gnome-flashback/libdesktop/org.gnome.Nautilus.FileOperations.xml 
b/dbus/org.gnome.Nautilus.FileOperations.xml
similarity index 100%
rename from gnome-flashback/libdesktop/org.gnome.Nautilus.FileOperations.xml
rename to dbus/org.gnome.Nautilus.FileOperations.xml
diff --git a/gnome-flashback/libdesktop/Makefile.am b/gnome-flashback/libdesktop/Makefile.am
index f7bcdd7..93f28d0 100644
--- a/gnome-flashback/libdesktop/Makefile.am
+++ b/gnome-flashback/libdesktop/Makefile.am
@@ -56,6 +56,7 @@ libdesktop_la_LDFLAGS = \
        $(NULL)
 
 libdesktop_la_LIBADD = \
+       $(top_builddir)/dbus/libdbus.la \
        $(top_builddir)/gnome-flashback/libcommon/libcommon.la \
        $(DESKTOP_LIBS) \
        $(NULL)
@@ -72,32 +73,14 @@ gf-desktop-enum-types.h: gf-desktop-enum-types.h.in $(ENUM_TYPES)
        $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/gf-desktop-enum-types.h.in $(ENUM_TYPES) > \
                gf-desktop-enum-types.h.tmp && mv gf-desktop-enum-types.h.tmp gf-desktop-enum-types.h
 
-gf-file-manager-gen.h:
-gf-file-manager-gen.c: org.freedesktop.FileManager1.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
-               --generate-c-code gf-file-manager-gen \
-               $(srcdir)/org.freedesktop.FileManager1.xml
-
-gf-nautilus-gen.h:
-gf-nautilus-gen.c: org.gnome.Nautilus.FileOperations.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
-               --generate-c-code gf-nautilus-gen \
-               $(srcdir)/org.gnome.Nautilus.FileOperations.xml
-
 BUILT_SOURCES = \
        gf-desktop-enum-types.c \
        gf-desktop-enum-types.h \
-       gf-file-manager-gen.c \
-       gf-file-manager-gen.h \
-       gf-nautilus-gen.c \
-       gf-nautilus-gen.h \
        $(NULL)
 
 EXTRA_DIST = \
        gf-desktop-enum-types.c.in \
        gf-desktop-enum-types.h.in \
-       org.freedesktop.FileManager1.xml \
-       org.gnome.Nautilus.FileOperations.xml \
        $(NULL)
 
 CLEANFILES = \
diff --git a/gnome-flashback/libdesktop/gf-icon-view.c b/gnome-flashback/libdesktop/gf-icon-view.c
index 32e70b9..3fbeeaf 100644
--- a/gnome-flashback/libdesktop/gf-icon-view.c
+++ b/gnome-flashback/libdesktop/gf-icon-view.c
@@ -21,15 +21,15 @@
 #include <gdk/gdkx.h>
 #include <glib/gi18n.h>
 
+#include "dbus/gf-file-manager-gen.h"
+#include "dbus/gf-nautilus-gen.h"
 #include "gf-create-folder-dialog.h"
 #include "gf-desktop-enum-types.h"
 #include "gf-desktop-enums.h"
 #include "gf-dummy-icon.h"
-#include "gf-file-manager-gen.h"
 #include "gf-home-icon.h"
 #include "gf-icon.h"
 #include "gf-monitor-view.h"
-#include "gf-nautilus-gen.h"
 #include "gf-trash-icon.h"
 #include "gf-utils.h"