[gnome-flashback] screensaver: simplify makefile

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

commit fba16df19e2b22be7ef2ee4a5f57b23244399d8e
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Dec 10 19:21:05 2019 +0200

    screensaver: simplify makefile

 gnome-flashback/libscreensaver/Makefile.am         | 24 ++++------------------
 .../org.freedesktop.login1.Manager.xml             |  1 +
 .../org.freedesktop.login1.Session.xml             |  1 +
 .../libscreensaver/org.gnome.ScreenSaver.xml       |  1 +
 .../org.gnome.SessionManager.Presence.xml          |  1 +
 5 files changed, 8 insertions(+), 20 deletions(-)
---
diff --git a/gnome-flashback/libscreensaver/Makefile.am b/gnome-flashback/libscreensaver/Makefile.am
index a20f41b..80e7361 100644
--- a/gnome-flashback/libscreensaver/Makefile.am
+++ b/gnome-flashback/libscreensaver/Makefile.am
@@ -39,42 +39,26 @@ libscreensaver_la_LIBADD = \
 
 gf-login-manager-gen.h:
 gf-login-manager-gen.c: org.freedesktop.login1.Manager.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) \
-               --interface-prefix org.freedesktop.login1.Manager. \
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
                --generate-c-code gf-login-manager-gen \
-               --c-namespace Gf \
-               --annotate "org.freedesktop.login1.Manager" \
-                          "org.gtk.GDBus.C.Name" LoginManagerGen \
                $(srcdir)/org.freedesktop.login1.Manager.xml
 
 gf-login-session-gen.h:
 gf-login-session-gen.c: org.freedesktop.login1.Session.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) \
-               --interface-prefix org.freedesktop.login1.Session. \
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
                --generate-c-code gf-login-session-gen \
-               --c-namespace Gf \
-               --annotate "org.freedesktop.login1.Session" \
-                          "org.gtk.GDBus.C.Name" LoginSessionGen \
                $(srcdir)/org.freedesktop.login1.Session.xml
 
 gf-screensaver-gen.h:
 gf-screensaver-gen.c: org.gnome.ScreenSaver.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) \
-               --interface-prefix org.gnome.ScreenSaver. \
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
                --generate-c-code gf-screensaver-gen \
-               --c-namespace Gf \
-               --annotate "org.gnome.ScreenSaver" \
-                          "org.gtk.GDBus.C.Name" ScreensaverGen \
                $(srcdir)/org.gnome.ScreenSaver.xml
 
 gf-sm-presence-gen.h:
 gf-sm-presence-gen.c: org.gnome.SessionManager.Presence.xml
-       $(AM_V_GEN) $(GDBUS_CODEGEN) \
-               --interface-prefix org.gnome.SessionManager.Presence. \
+       $(AM_V_GEN) $(GDBUS_CODEGEN) --c-namespace Gf \
                --generate-c-code gf-sm-presence-gen \
-               --c-namespace Gf \
-               --annotate "org.gnome.SessionManager.Presence" \
-                          "org.gtk.GDBus.C.Name" SmPresenceGen \
                $(srcdir)/org.gnome.SessionManager.Presence.xml
 
 BUILT_SOURCES = \
diff --git a/gnome-flashback/libscreensaver/org.freedesktop.login1.Manager.xml 
b/gnome-flashback/libscreensaver/org.freedesktop.login1.Manager.xml
index 628a728..372a166 100644
--- a/gnome-flashback/libscreensaver/org.freedesktop.login1.Manager.xml
+++ b/gnome-flashback/libscreensaver/org.freedesktop.login1.Manager.xml
@@ -3,6 +3,7 @@
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";>
 <node>
   <interface name="org.freedesktop.login1.Manager">
+    <annotation name="org.gtk.GDBus.C.Name" value="LoginManagerGen" />
 
     <signal name="PrepareForSleep">
       <arg type="b" direction="out" />
diff --git a/gnome-flashback/libscreensaver/org.freedesktop.login1.Session.xml 
b/gnome-flashback/libscreensaver/org.freedesktop.login1.Session.xml
index 9ce5f36..028dada 100644
--- a/gnome-flashback/libscreensaver/org.freedesktop.login1.Session.xml
+++ b/gnome-flashback/libscreensaver/org.freedesktop.login1.Session.xml
@@ -3,6 +3,7 @@
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";>
 <node>
   <interface name="org.freedesktop.login1.Session">
+    <annotation name="org.gtk.GDBus.C.Name" value="LoginSessionGen" />
 
     <property name="Active" type="b" access="read" />
 
diff --git a/gnome-flashback/libscreensaver/org.gnome.ScreenSaver.xml 
b/gnome-flashback/libscreensaver/org.gnome.ScreenSaver.xml
index 8112c7a..1c98e28 100644
--- a/gnome-flashback/libscreensaver/org.gnome.ScreenSaver.xml
+++ b/gnome-flashback/libscreensaver/org.gnome.ScreenSaver.xml
@@ -3,6 +3,7 @@
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";>
 <node>
   <interface name="org.gnome.ScreenSaver">
+    <annotation name="org.gtk.GDBus.C.Name" value="ScreensaverGen" />
 
     <method name="Lock">
     </method>
diff --git a/gnome-flashback/libscreensaver/org.gnome.SessionManager.Presence.xml 
b/gnome-flashback/libscreensaver/org.gnome.SessionManager.Presence.xml
index db89f4c..81cb8ca 100644
--- a/gnome-flashback/libscreensaver/org.gnome.SessionManager.Presence.xml
+++ b/gnome-flashback/libscreensaver/org.gnome.SessionManager.Presence.xml
@@ -3,6 +3,7 @@
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";>
 <node>
   <interface name="org.gnome.SessionManager.Presence">
+    <annotation name="org.gtk.GDBus.C.Name" value="SmPresenceGen" />
 
     <property name="status" type="u" access="readwrite" />