[gnome-settings-daemon] main: Remove gnome-settings-daemon binary

[Bastien Nocera <hadess src gnome org>]

commit 950251e7eb4264e4b8e6c31a972ff5232c4a0f9d
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Sep 26 19:09:00 2016 +0200

    main: Remove gnome-settings-daemon binary
    
    https://bugzilla.gnome.org/show_bug.cgi?id=772370

 Makefile.am                                    |    4 -
 autogen.sh                                     |    2 +-
 configure.ac                                   |   15 +-
 data/Makefile.am                               |   11 -
 data/gnome-settings-daemon.desktop.in.in       |    9 -
 gnome-settings-daemon/Makefile.am              |   33 +--
 gnome-settings-daemon/gnome-settings-manager.c |  456 ------------------------
 gnome-settings-daemon/gnome-settings-manager.h |   68 ----
 gnome-settings-daemon/main.c                   |  449 -----------------------
 man/Makefile.am                                |   19 -
 man/gnome-settings-daemon.xml                  |  140 --------
 po/POTFILES.in                                 |    2 -
 po/POTFILES.skip                               |    6 -
 13 files changed, 3 insertions(+), 1211 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index e7ae030..3c54c26 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,10 +8,6 @@ SUBDIRS =                      \
        tests                   \
        $(NULL)
 
-if ENABLE_MAN
-SUBDIRS += man
-endif
-
 # Honor aclocal flags
 ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
 
diff --git a/autogen.sh b/autogen.sh
index def7ad6..d70bcb8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,7 +11,7 @@ PKG_NAME="gnome-settings-daemon"
 
 (test -f $srcdir/configure.ac \
   && test -d $srcdir/gnome-settings-daemon \
-  && test -f $srcdir/gnome-settings-daemon/gnome-settings-manager.h) || {
+  && test -f $srcdir/gnome-settings-daemon/gnome-settings-bus.c) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level gnome-settings-daemon directory"
     exit 1
diff --git a/configure.ac b/configure.ac
index 965375e..2a68849 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT([gnome-settings-daemon],
         [3.23.1],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-settings-daemon])
 
-AC_CONFIG_SRCDIR([gnome-settings-daemon/gnome-settings-manager.c])
+AC_CONFIG_SRCDIR([gnome-settings-daemon/gnome-settings-bus.c])
 
 AM_INIT_AUTOMAKE([1.9 tar-ustar dist-xz no-dist-gzip check-news])
 AM_MAINTAINER_MODE([enable])
@@ -430,18 +430,6 @@ AC_SUBST([plugindir])
 PLUGIN_CFLAGS="-DG_LOG_DOMAIN=\"\\\"\$(plugin_name)-plugin\\\"\" -DPLUGIN_NAME=\"\\\"\$(plugin_name)\\\"\" "
 AC_SUBST(PLUGIN_CFLAGS)
 
-AC_ARG_ENABLE(man,
-              [AS_HELP_STRING([--enable-man],
-                              [generate man pages [default=yes]])],,
-              enable_man=yes)
-if test "$enable_man" != no; then
-  AC_PATH_PROG([XSLTPROC], [xsltproc])
-  if test -z "$XSLTPROC"; then
-    AC_MSG_ERROR([xsltproc is required for --enable-man])
-  fi
-fi
-AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
-
 dnl ---------------------------------------------------------------------------
 dnl - Finish
 dnl ---------------------------------------------------------------------------
@@ -547,7 +535,6 @@ data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in
 data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
 data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in
 po/Makefile.in
-man/Makefile
 tests/Makefile
 ])
 
diff --git a/data/Makefile.am b/data/Makefile.am
index c9d27dc..b2aee3d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -25,14 +25,6 @@ gsettings_SCHEMAS =                                                  \
 convertdir = $(datadir)/GConf/gsettings
 convert_DATA = gnome-settings-daemon.convert
 
-@INTLTOOL_DESKTOP_RULE@
-desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = gnome-settings-daemon.desktop.in.in
-desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
-
-gnome-settings-daemon.desktop.in: gnome-settings-daemon.desktop.in.in
-       $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@.tmp && mv $@.tmp $@
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnome-settings-daemon.pc
 
@@ -41,7 +33,6 @@ pkgconfig_DATA = gnome-settings-daemon.pc
 EXTRA_DIST =                                   \
        $(convert_DATA)                         \
        $(gsettings_SCHEMAS:.xml=.xml.in.in)    \
-       $(desktop_in_files)                     \
        $(gsettings_ENUM_FILES)                 \
        gnome-settings-daemon.pc.in             \
        $(api_DATA)                             \
@@ -49,8 +40,6 @@ EXTRA_DIST =                                  \
 
 DISTCLEANFILES =                       \
        $(gsettings_SCHEMAS)            \
-       $(desktop_DATA)                 \
-       gnome-settings-daemon.desktop.in \
        $(NULL)
 
 MAINTAINERCLEANFILES =                 \
diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am
index b6beb0f..d1125d2 100644
--- a/gnome-settings-daemon/Makefile.am
+++ b/gnome-settings-daemon/Makefile.am
@@ -88,11 +88,6 @@ libgsd_la_LDFLAGS =          \
        -no-undefined           \
        $(NULL)
 
-gsddir = $(libexecdir)
-
-gsd_PROGRAMS = \
-       gnome-settings-daemon
-
 EXTRA_DIST = \
        org.gnome.SessionManager.xml        \
        org.gnome.ScreenSaver.xml           \
@@ -103,33 +98,7 @@ apidir   = $(includedir)/gnome-settings-daemon-$(GSD_API_VERSION)/gnome-settings
 api_DATA =                             \
        gnome-settings-plugin.h
 
-gnome_settings_daemon_SOURCES =                \
-       main.c                          \
-       gnome-settings-manager.c        \
-       gnome-settings-manager.h        \
-       gnome-settings-plugin.c         \
-       gnome-settings-plugin.h         \
-       gnome-settings-plugin-info.c    \
-       gnome-settings-plugin-info.h    \
-       gnome-settings-module.c         \
-       gnome-settings-module.h         \
-       $(NULL)
-
-gnome_settings_daemon_CPPFLAGS = \
-       $(AM_CPPFLAGS)
-
-gnome_settings_daemon_CFLAGS =                 \
-       $(AM_CFLAGS)
-
-gnome_settings_daemon_LDFLAGS =        \
-       $(AM_LDFLAGS)
-
-gnome_settings_daemon_LDADD =          \
-       libgsd.la               \
-       $(SETTINGS_DAEMON_LIBS)         \
-       $(LIBNOTIFY_LIBS)               \
-       $(GNOME_DESKTOP_LIBS)           \
-       $(NULL)
+EXTRA_DIST += $(api_DATA)
 
 CLEANFILES = $(gsd_SCRIPTS)
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cac24fe..aa00f34 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
 # Files with translatable strings.
 # Please keep this file in alphabetical order.
-data/gnome-settings-daemon.desktop.in.in
 data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in
 data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
 data/org.gnome.settings-daemon.plugins.color.gschema.xml.in.in
@@ -11,7 +10,6 @@ data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
 data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in.in
 data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
 data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in
-gnome-settings-daemon/main.c
 plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
 plugins/color/gsd-color-calibrate.c
 plugins/color/gsd-color-manager.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index aedab97..886cf0f 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,12 +1,6 @@
 # Files with translatable strings to skip.
 # Please keep this file in alphabetical order.
 #
-# The following three desktop.in files are generated files, so
-# it is not necessary to check them for translatable strings.
-# Without these files, "make distcheck" fails.  Please do not
-# remove these unless you fix "make distcheck" a different way.
-#
-data/gnome-settings-daemon.desktop.in
 data/org.gnome.settings-daemon.peripherals.gschema.xml.in
 data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in
 data/org.gnome.settings-daemon.plugins.color.gschema.xml.in