[gnome-flashback] status-notifier-watcher: move D-Bus interface files to libdbus

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

commit 3e74e9a1c6252190c711f58c4c6ab9a60cde8655
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Dec 17 13:37:41 2019 +0200

    status-notifier-watcher: move D-Bus interface files to libdbus

 dbus/Makefile.am                                   |  9 ++++++++
 .../org.kde.StatusNotifierWatcher.xml              |  0
 .../libstatus-notifier-watcher/Makefile.am         | 24 +++-------------------
 .../libstatus-notifier-watcher/gf-sn-watcher-v0.h  |  2 +-
 4 files changed, 13 insertions(+), 22 deletions(-)
---
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 8f3b587..4b59bac 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -87,6 +87,12 @@ gf-sm-presence-gen.c: org.gnome.SessionManager.Presence.xml
                --generate-c-code gf-sm-presence-gen \
                $(srcdir)/org.gnome.SessionManager.Presence.xml
 
+gf-sn-watcher-v0-gen.h:
+gf-sn-watcher-v0-gen.c: org.kde.StatusNotifierWatcher.xml
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
+               --generate-c-code gf-sn-watcher-v0-gen \
+               $(srcdir)/org.kde.StatusNotifierWatcher.xml
+
 BUILT_SOURCES = \
        gf-accounts-gen.c \
        gf-accounts-gen.h \
@@ -108,6 +114,8 @@ BUILT_SOURCES = \
        gf-screensaver-gen.h \
        gf-sm-presence-gen.c \
        gf-sm-presence-gen.h \
+       gf-sn-watcher-v0-gen.c \
+       gf-sn-watcher-v0-gen.h \
        $(NULL)
 
 EXTRA_DIST = \
@@ -121,6 +129,7 @@ EXTRA_DIST = \
        org.gnome.Nautilus.FileOperations.xml \
        org.gnome.ScreenSaver.xml \
        org.gnome.SessionManager.Presence.xml \
+       org.kde.StatusNotifierWatcher.xml \
        $(NULL)
 
 CLEANFILES = \
diff --git a/gnome-flashback/libstatus-notifier-watcher/org.kde.StatusNotifierWatcher.xml 
b/dbus/org.kde.StatusNotifierWatcher.xml
similarity index 100%
rename from gnome-flashback/libstatus-notifier-watcher/org.kde.StatusNotifierWatcher.xml
rename to dbus/org.kde.StatusNotifierWatcher.xml
diff --git a/gnome-flashback/libstatus-notifier-watcher/Makefile.am 
b/gnome-flashback/libstatus-notifier-watcher/Makefile.am
index 8997557..b2ca712 100644
--- a/gnome-flashback/libstatus-notifier-watcher/Makefile.am
+++ b/gnome-flashback/libstatus-notifier-watcher/Makefile.am
@@ -7,7 +7,8 @@ noinst_LTLIBRARIES = \
 libstatus_notifier_watcher_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"status-notifier-watcher\" \
        -DG_LOG_USE_STRUCTURED=1 \
-       -I$(top_builddir)/gnome-flashback/libstatus-notifier-watcher \
+       -I$(top_srcdir) \
+       $(AM_CPPFLAGS) \
        $(NULL)
 
 libstatus_notifier_watcher_la_CFLAGS = \
@@ -21,7 +22,6 @@ libstatus_notifier_watcher_la_SOURCES = \
        gf-sn-watcher-v0.h \
        gf-status-notifier-watcher.c \
        gf-status-notifier-watcher.h \
-       $(BUILT_SOURCES) \
        $(NULL)
 
 libstatus_notifier_watcher_la_LDFLAGS = \
@@ -30,26 +30,8 @@ libstatus_notifier_watcher_la_LDFLAGS = \
        $(NULL)
 
 libstatus_notifier_watcher_la_LIBADD = \
+       $(top_builddir)/dbus/libdbus.la \
        $(STATUS_NOTIFIER_WATCHER_LIBS) \
        $(NULL)
 
-gf-sn-watcher-v0-gen.h:
-gf-sn-watcher-v0-gen.c: org.kde.StatusNotifierWatcher.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
-               --generate-c-code gf-sn-watcher-v0-gen \
-               $(srcdir)/org.kde.StatusNotifierWatcher.xml
-
-BUILT_SOURCES = \
-       gf-sn-watcher-v0-gen.c \
-       gf-sn-watcher-v0-gen.h \
-       $(NULL)
-
-EXTRA_DIST = \
-       org.kde.StatusNotifierWatcher.xml \
-       $(NULL)
-
-CLEANFILES = \
-       $(BUILT_SOURCES) \
-       $(NULL)
-
 -include $(top_srcdir)/git.mk
diff --git a/gnome-flashback/libstatus-notifier-watcher/gf-sn-watcher-v0.h 
b/gnome-flashback/libstatus-notifier-watcher/gf-sn-watcher-v0.h
index 73bf6d0..932726e 100644
--- a/gnome-flashback/libstatus-notifier-watcher/gf-sn-watcher-v0.h
+++ b/gnome-flashback/libstatus-notifier-watcher/gf-sn-watcher-v0.h
@@ -18,7 +18,7 @@
 #ifndef GF_SN_WATCHER_V0_H
 #define GF_SN_WATCHER_V0_H
 
-#include "gf-sn-watcher-v0-gen.h"
+#include "dbus/gf-sn-watcher-v0-gen.h"
 
 G_BEGIN_DECLS