[Spice-commits] doc/reference

Jeremy White jwhite at kemper.freedesktop.org
Tue Jul 28 08:49:39 PDT 2015


 doc/reference/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bf69423ffc0294bd782e110315169bd18edaa548
Author: Jeremy White <jwhite at codeweavers.com>
Date:   Tue Jul 28 09:21:19 2015 -0500

    Add the gtk libraries to the gtk-scandoc link line.
    
    This prevents a compile error on Debian Jessie, when building from git.
    
    This is fairly subtle, and Debian specific.  It only happens when you use
    autoreconf to generate a new libtool script.  Debian patches that script
    to require an explicit setting to link with all dependent libraries.
    
    It should be harmless on other distros, and it does save us Debian guys some
    hassle.

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 0e4d5b3..ed94138 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -55,7 +55,7 @@ IGNORE_HFILES=					\
 
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
 GTKDOC_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/src -I$(top_builddir)/src $(SPICE_GLIB_CFLAGS) $(SPICE_GTK_CFLAGS) $(COMMON_CFLAGS)
-GTKDOC_LIBS = $(top_builddir)/src/libspice-client-glib-2.0.la $(top_builddir)/src/libspice-client-gtk-$(SPICE_GTK_API_VERSION).la
+GTKDOC_LIBS = $(top_builddir)/src/libspice-client-glib-2.0.la $(top_builddir)/src/libspice-client-gtk-$(SPICE_GTK_API_VERSION).la $(GTK_LIBS)
 
 include $(top_srcdir)/gtk-doc.make
 


More information about the Spice-commits mailing list