[Telepathy-commits] [telepathy-gabble/master] link Gabble with libgibber

[Guillaume Desmottes]

---
 src/Makefile.am |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 1e11d45..c2e2a32 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -127,7 +127,9 @@ nodist_libgabble_convenience_la_SOURCES = \
 
 write_mgr_file_SOURCES = write-mgr-file.c
 
-write_mgr_file_LDADD = libgabble-convenience.la $(ALL_LIBS)
+write_mgr_file_LDADD = libgabble-convenience.la \
+		       $(top_builddir)/lib/gibber/libgibber.la \
+		       $(ALL_LIBS)
 
 telepathy_gabble_SOURCES = \
     main.c
@@ -140,15 +142,23 @@ check_c_sources = \
 include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
 
-telepathy_gabble_LDADD = libgabble-convenience.la $(ALL_LIBS)
+telepathy_gabble_LDADD = libgabble-convenience.la \
+			 $(top_builddir)/lib/gibber/libgibber.la \
+			 $(ALL_LIBS)
 
 noinst_LTLIBRARIES = libgabble-convenience.la
 
 AM_CFLAGS = $(ERROR_CFLAGS) -I$(top_srcdir) -I$(top_builddir) \
 	    @DBUS_CFLAGS@ @GLIB_CFLAGS@ @LOUDMOUTH_CFLAGS@ \
-	    @HANDLE_LEAK_DEBUG_CFLAGS@ @COVERAGE_CFLAGS@ @TP_GLIB_CFLAGS@
+	    @HANDLE_LEAK_DEBUG_CFLAGS@ @COVERAGE_CFLAGS@ @TP_GLIB_CFLAGS@ \
+	    -I $(top_srcdir)/lib -I $(top_builddir)/lib
 ALL_LIBS =  @DBUS_LIBS@ @GLIB_LIBS@ @LOUDMOUTH_LIBS@ @TP_GLIB_LIBS@
 
+# Teach it how to make libgibber.la
+$(top_builddir)/lib/gibber/libgibber.la:
+	${MAKE} -C $(top_builddir)/lib/gibber libgibber.la
+
+.PHONY: $(top_builddir)/lib/gibber/libgibber.la
 
 gabble-signals-marshal.list: $(libgabble_convenience_la_SOURCES) Makefile.am
 	( cd $(srcdir) && \
-- 
1.5.6.5