diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | doc/libempathy-gtk/Makefile.am | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,5 +1,10 @@ 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 the not typing case. Fixes bug #474603 (Cosimo Cecchi). diff --git a/doc/libempathy-gtk/Makefile.am b/doc/libempathy-gtk/Makefile.am index a763ae92d..925daf5c1 100644 --- 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 |