/soc/2013/ankitkv/gobjectification: ece784fc00a9: Merged default...

[Ankit Vani]

Changeset: ece784fc00a90893af162861c9a2c7cd29505f2e
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-02-19 18:13 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/ece784fc00a9

Description:

Merged default branch

diffstat:

 COPYRIGHT                           |   3 ++-
 doc/reference/finch/Makefile.am     |  11 ++++++++++-
 doc/reference/libpurple/Makefile.am |  23 +++++++++++++++++++++--
 doc/reference/pidgin/Makefile.am    |  20 ++++++++++++++++++--
 4 files changed, 51 insertions(+), 6 deletions(-)

diffs (111 lines):

diff --git a/COPYRIGHT b/COPYRIGHT
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -15,7 +15,7 @@ If concerns are raised as to the copyrig
 piece of code, then that code should be traced through our version
 control system to see from where it came and who has modified it.
 
-Copyright (C) 1998-2013 by the following:
+Copyright (C) 1998-2014 by the following:
 
 Mark
 Saleem Abdulrasool
@@ -572,6 +572,7 @@ Martijn van Beers
 Gideon van Melle
 Arjan van de Ven
 Philip Van Hoof
+Ankit Vani
 Kristof Vansant
 James Vega
 David Vermeille
diff --git a/doc/reference/finch/Makefile.am b/doc/reference/finch/Makefile.am
--- a/doc/reference/finch/Makefile.am
+++ b/doc/reference/finch/Makefile.am
@@ -98,10 +98,19 @@ GTKDOC_CFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(LIBXML_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \
+	$(INTROSPECTION_CFLAGS) \
 	$(GNT_CFLAGS)
 
 GTKDOC_LIBS = \
-	$(top_builddir)/finch/libfinch.la
+	$(top_builddir)/finch/libfinch.la \
+	$(DBUS_LIBS) \
+	$(INTLLIBS) \
+	$(GLIB_LIBS) \
+	$(GPLUGIN_LIBS) \
+	$(LIBXML_LIBS) \
+	$(GNT_LIBS) \
+	$(GSTREAMER_LIBS) \
+	$(INTROSPECTION_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/doc/reference/libpurple/Makefile.am b/doc/reference/libpurple/Makefile.am
--- a/doc/reference/libpurple/Makefile.am
+++ b/doc/reference/libpurple/Makefile.am
@@ -134,10 +134,29 @@ GTKDOC_CFLAGS = \
 	$(JSON_CFLAGS) \
 	$(GNUTLS_CFLAGS) \
 	$(NSS_CFLAGS) \
-	$(ZLIB_CFLAGS)
+	$(ZLIB_CFLAGS) \
+	$(INTROSPECTION_CFLAGS)
 
 GTKDOC_LIBS = \
-	$(top_builddir)/libpurple/libpurple.la
+	$(top_builddir)/libpurple/libpurple.la \
+	$(STATIC_LINK_LIBS) \
+	$(DBUS_LIBS) \
+	$(GLIB_LIBS) \
+	$(GPLUGIN_LIBS) \
+	$(LIBXML_LIBS) \
+	$(NETWORKMANAGER_LIBS) \
+	$(INTLLIBS) \
+	$(FARSTREAM_LIBS) \
+	$(GSTREAMER_LIBS) \
+	$(GSTVIDEO_LIBS) \
+	$(GSTINTERFACES_LIBS) \
+	$(IDN_LIBS) \
+	$(JSON_LIBS) \
+	$(GNUTLS_LIBS) \
+	$(NSS_LIBS) \
+	$(ZLIB_LIBS) \
+	$(INTROSPECTION_LIBS) \
+	-lm
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/doc/reference/pidgin/Makefile.am b/doc/reference/pidgin/Makefile.am
--- a/doc/reference/pidgin/Makefile.am
+++ b/doc/reference/pidgin/Makefile.am
@@ -108,10 +108,26 @@ GTKDOC_CFLAGS = \
 	$(GTKSPELL_CFLAGS) \
 	$(LIBXML_CFLAGS) \
 	$(WEBKIT_CFLAGS) \
-	$(INTGG_CFLAGS)
+	$(INTROSPECTION_CFLAGS)
 
 GTKDOC_LIBS = \
-	$(top_builddir)/pidgin/libpidgin.la
+	$(top_builddir)/pidgin/libpidgin.la \
+	$(GLIB_LIBS) \
+	$(GPLUGIN_LIBS) \
+	$(GCR_LIBS) \
+	$(DBUS_LIBS) \
+	$(GSTREAMER_LIBS) \
+	$(GSTVIDEO_LIBS) \
+	$(GSTINTERFACES_LIBS) \
+	$(XSS_LIBS) \
+	$(SM_LIBS) \
+	$(INTLLIBS) \
+	$(GTKSPELL_LIBS) \
+	$(LIBXML_LIBS) \
+	$(WEBKIT_LIBS) \
+	$(GTK_LIBS) \
+	$(X11_LIBS) \
+	$(INTROSPECTION_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make