Merge branch '012-build' into telepathy-glib-0.12

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>

11 files changed, 178 insertions, 118 deletions

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index ed1d106d5..b31a998c7 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -103,8 +103,8 @@ expand_content_files=
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
 	 @DBUS_CFLAGS@ @GLIB_CFLAGS@
-GTKDOC_LIBS=@DBUS_LIBS@ @GLIB_LIBS@ \
-	    $(top_builddir)/telepathy-glib/libtelepathy-glib.la
+GTKDOC_LIBS=$(top_builddir)/telepathy-glib/libtelepathy-glib.la \
+            @DBUS_LIBS@ @GLIB_LIBS@
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/examples/client/Makefile.am b/examples/client/Makefile.am
index b81266d2b..c711d30ac 100644
--- a/examples/client/Makefile.am
+++ b/examples/client/Makefile.am
@@ -40,14 +40,20 @@ noinst_PROGRAMS = $(EXAMPLES)
 endif
 
 # In an external project you'd use $(TP_GLIB_LIBS) (obtained from
-# pkg-config via autoconf) instead of the .la path
+# pkg-config via autoconf) instead of the .la path, and put it last; we use
+# a different format here because we're part of the telepathy-glib source tree.
+# Similarly, in an external project you'd put $(TP_GLIB_CFLAGS) at the end of
+# AM_CPPFLAGS.
 LDADD = \
-    @DBUS_LIBS@ \
-    @GLIB_LIBS@ \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib.la
-
-AM_CFLAGS = \
-    $(ERROR_CFLAGS) \
-    @DBUS_CFLAGS@ \
-    @GLIB_CFLAGS@ \
-    @TP_GLIB_CFLAGS@
+    $(top_builddir)/telepathy-glib/libtelepathy-glib.la \
+    $(GLIB_LIBS) \
+    $(DBUS_LIBS) \
+    $(NULL)
+
+AM_CPPFLAGS = \
+    -I${top_srcdir} -I${top_builddir} \
+    $(GLIB_CFLAGS) \
+    $(DBUS_CFLAGS) \
+    $(NULL)
+
+AM_CFLAGS = $(ERROR_CFLAGS)
diff --git a/examples/cm/callable/Makefile.am b/examples/cm/callable/Makefile.am
index 0fdc41f8e..21342ab50 100644
--- a/examples/cm/callable/Makefile.am
+++ b/examples/cm/callable/Makefile.am
@@ -23,12 +23,7 @@ libexample_cm_callable_la_SOURCES = \
     protocol.c \
     protocol.h
 
-# In an external project you'd use $(TP_GLIB_LIBS) (obtained from
-# pkg-config via autoconf) instead of the .la path
-libexample_cm_callable_la_LIBADD = \
-    $(GLIB_LIBS) \
-    $(DBUS_LIBS) \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib.la
+libexample_cm_callable_la_LIBADD = $(LDADD)
 
 telepathy_example_cm_callable_SOURCES = \
     main.c
@@ -36,12 +31,6 @@ telepathy_example_cm_callable_SOURCES = \
 telepathy_example_cm_callable_LDADD = \
     $(noinst_LTLIBRARIES)
 
-AM_CFLAGS = \
-    $(ERROR_CFLAGS) \
-    $(DBUS_CFLAGS) \
-    $(GLIB_CFLAGS) \
-    $(TP_GLIB_CFLAGS)
-
 servicedir = ${datadir}/dbus-1/services
 
 if INSTALL_EXAMPLES
@@ -58,3 +47,22 @@ endif
 
 clean-local:
 	rm -rf _gen
+
+# In an external project you'd use $(TP_GLIB_LIBS) (obtained from
+# pkg-config via autoconf) instead of the .la path, and put it last; we use
+# a different format here because we're part of the telepathy-glib source tree.
+LDADD = \
+    $(top_builddir)/telepathy-glib/libtelepathy-glib.la \
+    $(GLIB_LIBS) \
+    $(DBUS_LIBS) \
+    $(NULL)
+
+# Similarly, in an external project you'd put $(TP_GLIB_CFLAGS) at the end of
+# AM_CPPFLAGS.
+AM_CPPFLAGS = \
+    -I${top_srcdir} -I${top_builddir} \
+    $(GLIB_CFLAGS) \
+    $(DBUS_CFLAGS) \
+    $(NULL)
+
+AM_CFLAGS = $(ERROR_CFLAGS)
diff --git a/examples/cm/channelspecific/Makefile.am b/examples/cm/channelspecific/Makefile.am
index 7ba09c7e8..ba853cc1d 100644
--- a/examples/cm/channelspecific/Makefile.am
+++ b/examples/cm/channelspecific/Makefile.am
@@ -22,12 +22,7 @@ libexample_cm_csh_la_SOURCES = \
     room-manager.c \
     room-manager.h
 
-# In an external project you'd use $(TP_GLIB_LIBS) (obtained from
-# pkg-config via autoconf) instead of the .la path
-libexample_cm_csh_la_LIBADD = \
-    $(GLIB_LIBS) \
-    $(DBUS_LIBS) \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib.la
+libexample_cm_csh_la_LIBADD = $(LDADD)
 
 telepathy_example_cm_csh_SOURCES = \
     main.c
@@ -35,12 +30,6 @@ telepathy_example_cm_csh_SOURCES = \
 telepathy_example_cm_csh_LDADD = \
     $(noinst_LTLIBRARIES)
 
-AM_CFLAGS = \
-    $(ERROR_CFLAGS) \
-    $(DBUS_CFLAGS) \
-    $(GLIB_CFLAGS) \
-    $(TP_GLIB_CFLAGS)
-
 servicedir = ${datadir}/dbus-1/services
 
 if INSTALL_EXAMPLES
@@ -57,3 +46,22 @@ endif
 
 clean-local:
 	rm -rf _gen
+
+# In an external project you'd use $(TP_GLIB_LIBS) (obtained from
+# pkg-config via autoconf) instead of the .la path, and put it last; we use
+# a different format here because we're part of the telepathy-glib source tree.
+LDADD = \
+    $(top_builddir)/telepathy-glib/libtelepathy-glib.la \
+    $(GLIB_LIBS) \
+    $(DBUS_LIBS) \
+    $(NULL)
+
+# Similarly, in an external project you'd put $(TP_GLIB_CFLAGS) at the end of
+# AM_CPPFLAGS.
+AM_CPPFLAGS = \
+    -I${top_srcdir} -I${top_builddir} \
+    $(GLIB_CFLAGS) \
+    $(DBUS_CFLAGS) \
+    $(NULL)
+
+AM_CFLAGS = $(ERROR_CFLAGS)
diff --git a/examples/cm/contactlist/Makefile.am b/examples/cm/contactlist/Makefile.am
index 9a8f34797..6af6e0666 100644
--- a/examples/cm/contactlist/Makefile.am
+++ b/examples/cm/contactlist/Makefile.am
@@ -21,12 +21,7 @@ libexample_cm_contactlist_la_SOURCES = \
     protocol.c \
     protocol.h
 
-# In an external project you'd use $(TP_GLIB_LIBS) (obtained from
-# pkg-config via autoconf) instead of the .la path
-libexample_cm_contactlist_la_LIBADD = \
-    $(GLIB_LIBS) \
-    $(DBUS_LIBS) \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib.la
+libexample_cm_contactlist_la_LIBADD = $(LDADD)
 
 telepathy_example_cm_contactlist_SOURCES = \
     main.c
@@ -34,12 +29,6 @@ telepathy_example_cm_contactlist_SOURCES = \
 telepathy_example_cm_contactlist_LDADD = \
     $(noinst_LTLIBRARIES)
 
-AM_CFLAGS = \
-    $(ERROR_CFLAGS) \
-    $(DBUS_CFLAGS) \
-    $(GLIB_CFLAGS) \
-    $(TP_GLIB_CFLAGS)
-
 if INSTALL_EXAMPLES
 servicedir = ${datadir}/dbus-1/services
 service_DATA = _gen/org.freedesktop.Telepathy.ConnectionManager.example_contact_list.service
@@ -55,3 +44,22 @@ endif
 
 clean-local:
 	rm -rf _gen
+
+# In an external project you'd use $(TP_GLIB_LIBS) (obtained from
+# pkg-config via autoconf) instead of the .la path, and put it last; we use
+# a different format here because we're part of the telepathy-glib source tree.
+LDADD = \
+    $(top_builddir)/telepathy-glib/libtelepathy-glib.la \
+    $(GLIB_LIBS) \
+    $(DBUS_LIBS) \
+    $(NULL)
+
+# Similarly, in an external project you'd put $(TP_GLIB_CFLAGS) at the end of
+# AM_CPPFLAGS.
+AM_CPPFLAGS = \
+    -I${top_srcdir} -I${top_builddir} \
+    $(GLIB_CFLAGS) \
+    $(DBUS_CFLAGS) \
+    $(NULL)
+
+AM_CFLAGS = $(ERROR_CFLAGS)
diff --git a/examples/cm/echo-message-parts/Makefile.am b/examples/cm/echo-message-parts/Makefile.am
index 36577d947..84f420dcc 100644
--- a/examples/cm/echo-message-parts/Makefile.am
+++ b/examples/cm/echo-message-parts/Makefile.am
@@ -19,12 +19,7 @@ libexample_cm_echo_2_la_SOURCES = \
     im-manager.c \
     im-manager.h
 
-# In an external project you'd use $(TP_GLIB_LIBS) (obtained from
-# pkg-config via autoconf) instead of the .la path
-libexample_cm_echo_2_la_LIBADD = \
-    $(GLIB_LIBS) \
-    $(DBUS_LIBS) \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib.la
+libexample_cm_echo_2_la_LIBADD = $(LDADD)
 
 telepathy_example_cm_echo_2_SOURCES = \
     main.c
@@ -32,12 +27,6 @@ telepathy_example_cm_echo_2_SOURCES = \
 telepathy_example_cm_echo_2_LDADD = \
     $(noinst_LTLIBRARIES)
 
-AM_CFLAGS = \
-    $(ERROR_CFLAGS) \
-    $(DBUS_CFLAGS) \
-    $(GLIB_CFLAGS) \
-    $(TP_GLIB_CFLAGS)
-
 if INSTALL_EXAMPLES
 servicedir = ${datadir}/dbus-1/services
 service_DATA = _gen/org.freedesktop.Telepathy.ConnectionManager.example_echo_2.service
@@ -53,3 +42,22 @@ endif
 
 clean-local:
 	rm -rf _gen
+
+# In an external project you'd use $(TP_GLIB_LIBS) (obtained from
+# pkg-config via autoconf) instead of the .la path, and put it last; we use
+# a different format here because we're part of the telepathy-glib source tree.
+LDADD = \
+    $(top_builddir)/telepathy-glib/libtelepathy-glib.la \
+    $(GLIB_LIBS) \
+    $(DBUS_LIBS) \
+    $(NULL)
+
+# Similarly, in an external project you'd put $(TP_GLIB_CFLAGS) at the end of
+# AM_CPPFLAGS.
+AM_CPPFLAGS = \
+    -I${top_srcdir} -I${top_builddir} \
+    $(GLIB_CFLAGS) \
+    $(DBUS_CFLAGS) \
+    $(NULL)
+
+AM_CFLAGS = $(ERROR_CFLAGS)
diff --git a/examples/cm/extended/Makefile.am b/examples/cm/extended/Makefile.am
index 9653b6472..6f33246d4 100644
--- a/examples/cm/extended/Makefile.am
+++ b/examples/cm/extended/Makefile.am
@@ -15,20 +15,6 @@ telepathy_example_cm_extended_SOURCES = \
     protocol.h \
     main.c
 
-# In an external project you'd use $(TP_GLIB_LIBS) (obtained from
-# pkg-config via autoconf) instead of the path to libtelepathy-glib.la
-telepathy_example_cm_extended_LDADD = \
-    $(GLIB_LIBS) \
-    $(DBUS_LIBS) \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib.la \
-    $(top_builddir)/examples/extensions/libexample-extensions.la
-
-AM_CFLAGS = \
-    $(ERROR_CFLAGS) \
-    $(DBUS_CFLAGS) \
-    $(GLIB_CFLAGS) \
-    $(TP_GLIB_CFLAGS)
-
 if INSTALL_EXAMPLES
 servicedir = ${datadir}/dbus-1/services
 service_DATA = _gen/org.freedesktop.Telepathy.ConnectionManager.example_extended.service
@@ -44,3 +30,23 @@ endif
 
 clean-local:
 	rm -rf _gen
+
+# In an external project you'd use $(TP_GLIB_LIBS) (obtained from
+# pkg-config via autoconf) instead of the .la path, and put it last; we use
+# a different format here because we're part of the telepathy-glib source tree.
+LDADD = \
+    $(top_builddir)/examples/extensions/libexample-extensions.la \
+    $(top_builddir)/telepathy-glib/libtelepathy-glib.la \
+    $(GLIB_LIBS) \
+    $(DBUS_LIBS) \
+    $(NULL)
+
+# Similarly, in an external project you'd put $(TP_GLIB_CFLAGS) at the end of
+# AM_CPPFLAGS.
+AM_CPPFLAGS = \
+    -I${top_srcdir} -I${top_builddir} \
+    $(GLIB_CFLAGS) \
+    $(DBUS_CFLAGS) \
+    $(NULL)
+
+AM_CFLAGS = $(ERROR_CFLAGS)
diff --git a/examples/cm/no-protocols/Makefile.am b/examples/cm/no-protocols/Makefile.am
index 486406bf8..b0d850e9d 100644
--- a/examples/cm/no-protocols/Makefile.am
+++ b/examples/cm/no-protocols/Makefile.am
@@ -11,19 +11,6 @@ telepathy_example_no_protocols_SOURCES = \
     connection-manager.h \
     main.c
 
-# In an external project you'd use $(TP_GLIB_LIBS) (obtained from
-# pkg-config via autoconf) instead of the .la path
-telepathy_example_no_protocols_LDADD = \
-    $(GLIB_LIBS) \
-    $(DBUS_LIBS) \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib.la
-
-AM_CFLAGS = \
-    $(ERROR_CFLAGS) \
-    @DBUS_CFLAGS@ \
-    @GLIB_CFLAGS@ \
-    @TP_GLIB_CFLAGS@
-
 if INSTALL_EXAMPLES
 servicedir = ${datadir}/dbus-1/services
 service_DATA = _gen/org.freedesktop.Telepathy.ConnectionManager.example_no_protocols.service
@@ -39,3 +26,22 @@ endif
 
 clean-local:
 	rm -rf _gen
+
+# In an external project you'd use $(TP_GLIB_LIBS) (obtained from
+# pkg-config via autoconf) instead of the .la path, and put it last; we use
+# a different format here because we're part of the telepathy-glib source tree.
+LDADD = \
+    $(top_builddir)/telepathy-glib/libtelepathy-glib.la \
+    $(GLIB_LIBS) \
+    $(DBUS_LIBS) \
+    $(NULL)
+
+# Similarly, in an external project you'd put $(TP_GLIB_CFLAGS) at the end of
+# AM_CPPFLAGS.
+AM_CPPFLAGS = \
+    -I${top_srcdir} -I${top_builddir} \
+    $(GLIB_CFLAGS) \
+    $(DBUS_CFLAGS) \
+    $(NULL)
+
+AM_CFLAGS = $(ERROR_CFLAGS)
diff --git a/examples/future/call-cm/Makefile.am b/examples/future/call-cm/Makefile.am
index 1fcab3e9f..0193afe2e 100644
--- a/examples/future/call-cm/Makefile.am
+++ b/examples/future/call-cm/Makefile.am
@@ -25,13 +25,7 @@ libexample_cm_call_la_SOURCES = \
     protocol.c \
     protocol.h
 
-# In an external project you'd use $(TP_GLIB_LIBS) (obtained from
-# pkg-config via autoconf) instead of the .la path
-libexample_cm_call_la_LIBADD = \
-    $(GLIB_LIBS) \
-    $(DBUS_LIBS) \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib.la \
-    $(top_builddir)/extensions/libfuture-extensions.la
+libexample_cm_call_la_LIBADD = $(LDADD)
 
 telepathy_example_cm_call_SOURCES = \
     main.c
@@ -39,12 +33,6 @@ telepathy_example_cm_call_SOURCES = \
 telepathy_example_cm_call_LDADD = \
     $(noinst_LTLIBRARIES)
 
-AM_CFLAGS = \
-    $(ERROR_CFLAGS) \
-    $(DBUS_CFLAGS) \
-    $(GLIB_CFLAGS) \
-    $(TP_GLIB_CFLAGS)
-
 servicedir = ${datadir}/dbus-1/services
 
 if INSTALL_EXAMPLES
@@ -61,3 +49,24 @@ endif
 
 clean-local:
 	rm -rf _gen
+
+# In an external project you'd use $(TP_GLIB_LIBS) (obtained from
+# pkg-config via autoconf) instead of the .la path, and put it last; we use
+# a different format here because we're part of the telepathy-glib source tree.
+LDADD = \
+    $(top_builddir)/extensions/libfuture-extensions.la \
+    $(top_builddir)/telepathy-glib/libtelepathy-glib.la \
+    $(GLIB_LIBS) \
+    $(DBUS_LIBS) \
+    $(NULL)
+
+# Similarly, in an external project you'd put $(TP_GLIB_CFLAGS) at the end of
+# AM_CPPFLAGS.
+AM_CPPFLAGS = \
+    -I${top_srcdir} -I${top_builddir} \
+    $(GLIB_CFLAGS) \
+    $(DBUS_CFLAGS) \
+    $(NULL)
+
+AM_CFLAGS = $(ERROR_CFLAGS)
+
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2289036a1..d04791249 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -103,21 +103,19 @@ check-local: check-coding-style
 
 LDADD = \
     $(top_builddir)/telepathy-glib/libtelepathy-glib.la \
+    $(GLIB_LIBS) \
     $(DBUS_LIBS) \
-    $(GLIB_LIBS)
+    $(NULL)
 
-AM_CFLAGS = \
-    $(ERROR_CFLAGS) \
-    $(DBUS_CFLAGS) \
-    $(GLIB_CFLAGS) \
+AM_CPPFLAGS = \
+    -I${top_srcdir} -I${top_builddir} \
     -D_TP_IGNORE_DEPRECATIONS \
-    $(TP_GLIB_CFLAGS)
-
-AM_CXXFLAGS = \
-    $(DBUS_CFLAGS) \
     $(GLIB_CFLAGS) \
-    -D_TP_IGNORE_DEPRECATIONS \
-    $(TP_GLIB_CFLAGS)
+    $(DBUS_CFLAGS) \
+    $(NULL)
+
+AM_CFLAGS = $(ERROR_CFLAGS)
+AM_CXXFLAGS = $(ERROR_CXXFLAGS)
 
 if HAVE_CXX
 noinst_PROGRAMS += \
diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index 4d4edcc90..da3a6316d 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -51,10 +51,11 @@ noinst_PROGRAMS = \
 TESTS = $(noinst_PROGRAMS)
 
 LDADD = \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib.la \
     $(top_builddir)/tests/lib/libtp-glib-tests.la \
+    $(top_builddir)/telepathy-glib/libtelepathy-glib.la \
+    $(GLIB_LIBS) \
     $(DBUS_LIBS) \
-    $(GLIB_LIBS)
+    $(NULL)
 
 test_account_SOURCES = account.c
 
@@ -181,12 +182,14 @@ check_c_sources = *.c
 include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
 
-AM_CFLAGS = \
-    $(ERROR_CFLAGS) \
-    $(DBUS_CFLAGS) \
-    $(GLIB_CFLAGS) \
+AM_CPPFLAGS = \
+    -I${top_srcdir} -I${top_builddir} \
     -D_TP_IGNORE_DEPRECATIONS \
-    $(TP_GLIB_CFLAGS)
+    $(GLIB_CFLAGS) \
+    $(DBUS_CFLAGS) \
+    $(NULL)
+
+AM_CFLAGS = $(ERROR_CFLAGS)
 
 TESTS_ENVIRONMENT = \
     abs_top_builddir=@abs_top_builddir@ \