Advertisement
Guest User

Untitled

a guest
Aug 18th, 2017
450
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.57 KB | None | 0 0
  1. commit 97abcda1a2771df13228da92dc6b975088d86bd6
  2. Author: Damien Lespiau <damien.lespiau@intel.com>
  3. Date: Wed May 18 14:14:28 2011 +0100
  4.  
  5. build: Fix generation of the documentation Makefiles
  6.  
  7. Automake seems a bit fragile when trying to do cunning things like
  8. including a file with "-include". It does not recurse into that file (if
  9. it exists) to generate the final Makefiles.
  10.  
  11. Let's add a if BUILD_GTK_DOC guard around the gtk-doc.make inclusion
  12. instead, hopefully should work as intended.
  13.  
  14. diff --git a/doc/reference/cogl-2.0/Makefile.am b/doc/reference/cogl-2.0/Makefil
  15. index 9e61c2f..51a1b8b 100644
  16. --- a/doc/reference/cogl-2.0/Makefile.am
  17. +++ b/doc/reference/cogl-2.0/Makefile.am
  18. @@ -143,7 +143,9 @@ GTKDOC_LIBS=$(top_builddir)/cogl/libcogl.la $(COGL_DEP_LIBS)
  19.  
  20. # This includes the standard gtk-doc make rules, copied by gtkdocize.
  21. EXTRA_DIST =
  22. --include $(top_srcdir)/gtk-doc.make
  23. +if BUILD_GTK_DOC
  24. +include $(top_srcdir)/gtk-doc.make
  25. +endif
  26.  
  27. # Other files to distribute
  28. # e.g. EXTRA_DIST += version.xml.in
  29. diff --git a/doc/reference/cogl/Makefile.am b/doc/reference/cogl/Makefile.am
  30. index 614494f..66550cc 100644
  31. --- a/doc/reference/cogl/Makefile.am
  32. +++ b/doc/reference/cogl/Makefile.am
  33. @@ -140,7 +140,9 @@ GTKDOC_LIBS=$(top_builddir)/cogl/libcogl.la $(COGL_DEP_LIBS)
  34.  
  35. # This includes the standard gtk-doc make rules, copied by gtkdocize.
  36. EXTRA_DIST =
  37. --include $(top_srcdir)/gtk-doc.make
  38. +if BUILD_GTK_DOC
  39. +include $(top_srcdir)/gtk-doc.make
  40. +endif
  41.  
  42. # Other files to distribute
  43. # e.g. EXTRA_DIST += version.xml.in
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement