/pidgin/main: d9428ff72069: Fix gtk-doc flags and libs
Ankit Vani
a at nevitus.org
Wed Feb 19 07:31:18 EST 2014
Changeset: d9428ff72069fd28ed30059c111c62e0a0890444
Author: Ankit Vani <a at nevitus.org>
Date: 2014-02-19 18:00 +0530
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/d9428ff72069
Description:
Fix gtk-doc flags and libs
diffstat:
doc/reference/finch/Makefile.am | 9 +++++++--
doc/reference/libpurple/Makefile.am | 20 +++++++++++++++++---
doc/reference/pidgin/Makefile.am | 20 ++++++++++++++++----
3 files changed, 40 insertions(+), 9 deletions(-)
diffs (96 lines):
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
@@ -94,14 +94,19 @@ GTKDOC_CFLAGS = \
-I$(top_srcdir)/finch/libgnt \
$(DEBUG_CFLAGS) \
$(GLIB_CFLAGS) \
- $(GPLUGIN_CFLAGS) \
$(DBUS_CFLAGS) \
$(LIBXML_CFLAGS) \
$(GSTREAMER_CFLAGS) \
$(GNT_CFLAGS)
GTKDOC_LIBS = \
- $(top_builddir)/finch/libfinch.la
+ $(top_builddir)/finch/libfinch.la \
+ $(DBUS_LIBS) \
+ $(INTLLIBS) \
+ $(GLIB_LIBS) \
+ $(LIBXML_LIBS) \
+ $(GNT_LIBS) \
+ $(GSTREAMER_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
@@ -131,11 +131,25 @@ GTKDOC_CFLAGS = \
$(NETWORKMANAGER_CFLAGS) \
$(JSON_CFLAGS) \
$(GNUTLS_CFLAGS) \
- $(NSS_CFLAGS) \
- $(ZLIB_CFLAGS)
+ $(NSS_CFLAGS)
GTKDOC_LIBS = \
- $(top_builddir)/libpurple/libpurple.la
+ $(top_builddir)/libpurple/libpurple.la \
+ $(STATIC_LINK_LIBS) \
+ $(DBUS_LIBS) \
+ $(GLIB_LIBS) \
+ $(LIBXML_LIBS) \
+ $(NETWORKMANAGER_LIBS) \
+ $(INTLLIBS) \
+ $(FARSTREAM_LIBS) \
+ $(GSTREAMER_LIBS) \
+ $(GSTVIDEO_LIBS) \
+ $(GSTINTERFACES_LIBS) \
+ $(IDN_LIBS) \
+ $(JSON_LIBS) \
+ $(GNUTLS_LIBS) \
+ $(NSS_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
@@ -96,7 +96,6 @@ GTKDOC_CFLAGS = \
-I$(top_srcdir)/libpurple \
-I$(top_srcdir)/pidgin \
$(GLIB_CFLAGS) \
- $(GPLUGIN_CFLAGS) \
$(GCR_CFLAGS) \
$(GSTREAMER_CFLAGS) \
$(GSTVIDEO_CFLAGS) \
@@ -107,11 +106,24 @@ GTKDOC_CFLAGS = \
$(DBUS_CFLAGS) \
$(GTKSPELL_CFLAGS) \
$(LIBXML_CFLAGS) \
- $(WEBKIT_CFLAGS) \
- $(INTGG_CFLAGS)
+ $(WEBKIT_CFLAGS)
GTKDOC_LIBS = \
- $(top_builddir)/pidgin/libpidgin.la
+ $(top_builddir)/pidgin/libpidgin.la \
+ $(GLIB_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)
# This includes the standard gtk-doc make rules, copied by gtkdocize.
include $(top_srcdir)/gtk-doc.make
More information about the Commits
mailing list