[unique] build: Work with srcdir != builddir from git

[Colin Walters <walters src gnome org>]

commit 211b68408c6a6a8b29a52d38a43fe8b5cddf2e57
Author: Colin Walters <walters verbum org>
Date:   Mon Jan 13 18:46:53 2014 -0500

    build: Work with srcdir != builddir from git
    
    As implemented by Continuous.  I'm adding libunique to Continuous
    because it's a dependency of Geary.

 tests/Makefile.am        |    1 +
 unique/Makefile.am       |    2 +-
 unique/bacon/Makefile.am |    5 +++--
 unique/dbus/Makefile.am  |    3 ++-
 unique/gdbus/Makefile.am |    1 +
 5 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c0241c5..3725dac 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = \
        -DG_LOG_DOMAIN=\"Test-Unique\"  \
        -I$(top_srcdir)                 \
        -I$(top_builddir)               \
+       -I$(top_builddir)/unique        \
        $(UNIQUE_CFLAGS)                \
        $(UNIQUE_DEBUG_FLAGS)
 
diff --git a/unique/Makefile.am b/unique/Makefile.am
index b4a77f3..ad935bb 100644
--- a/unique/Makefile.am
+++ b/unique/Makefile.am
@@ -18,7 +18,7 @@ endif
 
 DIST_SUBDIRS = bacon dbus gdbus
 
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir) -I$(top_builddir)
 
 AM_CPPFLAGS = \
        -DG_DISABLE_SINGLE_INCLUDES     \
diff --git a/unique/bacon/Makefile.am b/unique/bacon/Makefile.am
index f4ab6b8..d86cf97 100644
--- a/unique/bacon/Makefile.am
+++ b/unique/bacon/Makefile.am
@@ -1,8 +1,9 @@
 libuniqueincludedir = $(includedir)/unique-1.0/unique
 
-INCLUDES = -I$(top_srcdir)
-
 AM_CPPFLAGS = \
+       -I$(top_srcdir) \
+       -I$(top_builddir) \
+       -I$(top_builddir)/unique \
        -DG_LOG_DOMAIN=\"Unique-Bacon\" \
        -DG_DISABLE_SINGLE_INCLUDES
 
diff --git a/unique/dbus/Makefile.am b/unique/dbus/Makefile.am
index 724ae99..5db4504 100644
--- a/unique/dbus/Makefile.am
+++ b/unique/dbus/Makefile.am
@@ -5,7 +5,8 @@ libuniqueincludedir = $(includedir)/unique-1.0/unique
 INCLUDES = \
        -DG_LOG_DOMAIN=\"Unique-DBus\"  \
        -DG_DISABLE_SINGLE_INCLUDES \
-       -I$(top_srcdir)
+       -I$(top_srcdir) \
+       -I$(top_builddir)/unique
 
 LDADD = $(UNIQUE_LIBS) $(DBUS_LIBS)
 
diff --git a/unique/gdbus/Makefile.am b/unique/gdbus/Makefile.am
index a3bf342..d607036 100644
--- a/unique/gdbus/Makefile.am
+++ b/unique/gdbus/Makefile.am
@@ -10,6 +10,7 @@ libunique_gdbus_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Unique-GDBus\" \
        -DG_DISABLE_SINGLE_INCLUDES     \
        -I$(top_srcdir)                 \
+       -I$(top_builddir)/unique        \
        $(AM_CPPFLAGS)
 
 libunique_gdbus_la_CFLAGS =    \