[gnome-flashback] build: fix builddir != srcdir

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

commit aef6880c32f45e419f98cea5028ff1e0a0ef8e08
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Feb 26 10:56:33 2017 +0200

    build: fix builddir != srcdir

 Makefile.am                                       |    2 +-
 autogen.sh                                        |    5 +++++
 gnome-flashback/libbluetooth-applet/Makefile.am   |    3 ++-
 gnome-flashback/libend-session-dialog/Makefile.am |    2 +-
 gnome-flashback/libinput-settings/Makefile.am     |    1 +
 gnome-flashback/libinput-sources/Makefile.am      |    8 ++++----
 gnome-flashback/libpower-applet/Makefile.am       |    3 ++-
 gnome-flashback/libshell/Makefile.am              |    8 ++++----
 gnome-flashback/libsound-applet/Makefile.am       |    5 +++--
 9 files changed, 23 insertions(+), 14 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9577b51..90f0619 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ MAINTAINERCLEANFILES = \
        $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
        $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
        $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
-       `find "m4" -type f -name "*.m4" -print` \
+       `find "$(srcdir)/m4" -type f -name "*.m4" -print` \
        $(srcdir)/ABOUT-NLS \
        $(srcdir)/INSTALL \
        $(srcdir)/config.h.in~ \
diff --git a/autogen.sh b/autogen.sh
index 888910b..5038018 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,6 +11,9 @@ if [ ! -f $srcdir/configure.ac ]; then
   exit 1
 fi
 
+olddir=$(pwd)
+cd "$srcdir"
+
 if [ ! -f $srcdir/gnome-flashback/libsound-applet/gvc/Makefile.am ]; then
        set -x
        git submodule init
@@ -34,6 +37,8 @@ aclocal --install || exit 1
 autoreconf --verbose --force --install -Wno-portability || exit 1
 { set +x; } 2>/dev/null
 
+cd "$olddir"
+
 if [ -z "$NOCONFIGURE" ]; then
   set -x
   $srcdir/configure "$@" || exit 1
diff --git a/gnome-flashback/libbluetooth-applet/Makefile.am b/gnome-flashback/libbluetooth-applet/Makefile.am
index 4041871..60d1f0e 100644
--- a/gnome-flashback/libbluetooth-applet/Makefile.am
+++ b/gnome-flashback/libbluetooth-applet/Makefile.am
@@ -7,13 +7,14 @@ noinst_LTLIBRARIES = \
 libbluetooth_applet_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"bluetooth-applet\" \
        -DG_LOG_USE_STRUCTURED=1 \
+       -I$(top_builddir)/gnome-flashback/libbluetooth-applet \
+       -I$(top_srcdir) \
        $(NULL)
 
 libbluetooth_applet_la_CFLAGS = \
        $(BLUETOOTH_APPLET_CFLAGS) \
        $(WARN_CFLAGS) \
        $(AM_CFLAGS) \
-       -I$(top_builddir)/gnome-flashback/libbluetooth-applet \
        $(NULL)
 
 libbluetooth_applet_la_SOURCES = \
diff --git a/gnome-flashback/libend-session-dialog/Makefile.am 
b/gnome-flashback/libend-session-dialog/Makefile.am
index d961006..2fc01d8 100644
--- a/gnome-flashback/libend-session-dialog/Makefile.am
+++ b/gnome-flashback/libend-session-dialog/Makefile.am
@@ -40,7 +40,7 @@ dbus-end-session-dialog.c: org.gnome.SessionManager.EndSessionDialog.xml Makefil
                --interface-prefix=org.gnome.SessionManager \
                --generate-c-code dbus-end-session-dialog \
                --c-namespace DBus \
-               org.gnome.SessionManager.EndSessionDialog.xml
+               $(srcdir)/org.gnome.SessionManager.EndSessionDialog.xml
 
 BUILT_SOURCES = \
        dbus-end-session-dialog.h \
diff --git a/gnome-flashback/libinput-settings/Makefile.am b/gnome-flashback/libinput-settings/Makefile.am
index 4b63603..5cb2978 100644
--- a/gnome-flashback/libinput-settings/Makefile.am
+++ b/gnome-flashback/libinput-settings/Makefile.am
@@ -7,6 +7,7 @@ noinst_LTLIBRARIES = \
 libinput_settings_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"input-settings\" \
        -DG_LOG_USE_STRUCTURED=1 \
+       -I$(top_builddir)/gnome-flashback/libdisplay-config \
        -I$(top_builddir)/gnome-flashback/libinput-settings \
        -I$(top_srcdir)/gnome-flashback \
        $(NULL)
diff --git a/gnome-flashback/libinput-sources/Makefile.am b/gnome-flashback/libinput-sources/Makefile.am
index fb35f69..86d16c0 100644
--- a/gnome-flashback/libinput-sources/Makefile.am
+++ b/gnome-flashback/libinput-sources/Makefile.am
@@ -7,16 +7,16 @@ noinst_LTLIBRARIES = \
 libinput_sources_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"input-sources\" \
        -DG_LOG_USE_STRUCTURED=1 \
+       -DGNOME_DESKTOP_USE_UNSTABLE_API \
+       -I$(top_builddir)/gnome-flashback/libinput-sources \
+       -I$(top_srcdir) \
+       -I$(top_srcdir)/gnome-flashback \
        $(NULL)
 
 libinput_sources_la_CFLAGS = \
        $(INPUT_SOURCES_CFLAGS) \
        $(WARN_CFLAGS) \
        $(AM_CFLAGS) \
-       -I$(srcdir)/../../gnome-flashback \
-       -I$(top_builddir)/gnome-flashback \
-       -I$(top_builddir)/gnome-flashback/libinput-sources \
-       -DGNOME_DESKTOP_USE_UNSTABLE_API \
        $(NULL)
 
 libinput_sources_la_SOURCES = \
diff --git a/gnome-flashback/libpower-applet/Makefile.am b/gnome-flashback/libpower-applet/Makefile.am
index abfda60..c7dac17 100644
--- a/gnome-flashback/libpower-applet/Makefile.am
+++ b/gnome-flashback/libpower-applet/Makefile.am
@@ -7,13 +7,14 @@ noinst_LTLIBRARIES = \
 libpower_applet_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"power-applet\" \
        -DG_LOG_USE_STRUCTURED=1 \
+       -I$(top_builddir)/gnome-flashback/libpower-applet \
+       -I$(top_srcdir) \
        $(NULL)
 
 libpower_applet_la_CFLAGS = \
        $(POWER_APPLET_CFLAGS) \
        $(WARN_CFLAGS) \
        $(AM_CFLAGS) \
-       -I$(top_builddir)/gnome-flashback/libpower-applet \
        $(NULL)
 
 libpower_applet_la_SOURCES = \
diff --git a/gnome-flashback/libshell/Makefile.am b/gnome-flashback/libshell/Makefile.am
index 0c22381..d23df02 100644
--- a/gnome-flashback/libshell/Makefile.am
+++ b/gnome-flashback/libshell/Makefile.am
@@ -7,16 +7,16 @@ noinst_LTLIBRARIES = \
 libshell_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"shell\" \
        -DG_LOG_USE_STRUCTURED=1 \
+       -I$(top_builddir)/gnome-flashback/libcommon \
+       -I$(top_builddir)/gnome-flashback/libdisplay-config \
+       -I$(top_builddir)/gnome-flashback/libshell \
+       -I$(top_srcdir)/gnome-flashback \
        $(NULL)
 
 libshell_la_CFLAGS = \
        $(SHELL_CFLAGS) \
        $(WARN_CFLAGS) \
        $(AM_CFLAGS) \
-       -I$(srcdir)/../../gnome-flashback \
-       -I$(top_builddir)/gnome-flashback \
-       -I$(top_builddir)/gnome-flashback/libcommon \
-       -I$(top_builddir)/gnome-flashback/libshell \
        $(NULL)
 
 libshell_la_SOURCES = \
diff --git a/gnome-flashback/libsound-applet/Makefile.am b/gnome-flashback/libsound-applet/Makefile.am
index ff2b7c6..149306d 100644
--- a/gnome-flashback/libsound-applet/Makefile.am
+++ b/gnome-flashback/libsound-applet/Makefile.am
@@ -11,14 +11,15 @@ noinst_LTLIBRARIES = \
 libsound_applet_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"sound-applet\" \
        -DG_LOG_USE_STRUCTURED=1 \
+       -I$(top_builddir)/gnome-flashback/libsound-applet \
+       -I$(top_srcdir) \
+       -I$(srcdir)/gvc \
        $(NULL)
 
 libsound_applet_la_CFLAGS = \
        $(SOUND_APPLET_CFLAGS) \
        $(WARN_CFLAGS) \
        $(AM_CFLAGS) \
-       -I$(top_builddir)/gnome-flashback/libsound-applet \
-       -I$(srcdir)/gvc \
        $(NULL)
 
 libsound_applet_la_SOURCES = \