Explicitely use libempathy from builddir. Fixes bug #478558 (Frederic

2007-09-21  Xavier Claessens  <xclaesse@gmail.com>

	* doc/libempathy-gtk/Makefile.am: Explicitely use libempathy from
	builddir. Fixes bug #478558 (Frederic Peters).

svn path=/trunk/; revision=308

diff --git a/ChangeLog b/ChangeLog
index 89a8a9fe6d07b055c47590bcae5c32090f41747a..c395899feea04c48531c8b71074e0f09ff7327a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-21  Xavier Claessens  <xclaesse@gmail.com>
+
+       * doc/libempathy-gtk/Makefile.am: Explicitely use libempathy from
+       builddir. Fixes bug #478558 (Frederic Peters).
+
 2007-09-21  Xavier Claessens  <xclaesse@gmail.com>
 
        * libempathy-gtk/empathy-chat.c: Move TP_CHANNEL_CHAT_STATE_PAUSED to

diff --git a/doc/libempathy-gtk/Makefile.am b/doc/libempathy-gtk/Makefile.am
index a763ae92d67c520031c0707c4d7611993c155bde..925daf5c1874740df84a1f7a05630fb098337a33 100644 (file)
--- a/doc/libempathy-gtk/Makefile.am
+++ b/doc/libempathy-gtk/Makefile.am
@@ -59,7 +59,7 @@ content_files=
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 INCLUDES=-I$(top_srcdir) $(EMPATHY_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/libempathy-gtk/libempathy-gtk.la $(EMPATHY_LIBS)
+GTKDOC_LIBS=$(top_builddir)/libempathy-gtk/libempathy-gtk.la $(top_builddir)/libempathy/libempathy.la $(EMPATHY_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make