[cairo-commit] 3 commits - doc/public Makefile.am

[Behdad Esfahbod]

 Makefile.am            |    8 ++------
 doc/public/Makefile.am |    9 ++++++---
 2 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 856fedd2359604ad2dca67c505e16111f23f1b61
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 15 16:19:12 2008 -0400

    [doc] Make "make check" build without gtk-doc

diff --git a/doc/public/Makefile.am b/doc/public/Makefile.am
index dfc26c8..d83dd55 100644
--- a/doc/public/Makefile.am
+++ b/doc/public/Makefile.am
@@ -50,8 +50,11 @@ include $(top_srcdir)/build/Makefile.am.gtk-doc
 
 dist-hook: doc
 
+if ENABLE_GTK_DOC
 check: doc
+TESTS += check-doc-coverage.sh
+endif
 
-TESTS_ENVIRONMENT = srcdir="$(srcdir)" top_srcdir="$(top_srcdir)" MAKE="$(MAKE)"
-TESTS += check-doc-coverage.sh check-doc-syntax.sh
-EXTRA_DIST += $(TESTS)
+TESTS += check-doc-syntax.sh
+EXTRA_DIST += check-doc-coverage.sh check-doc-syntax.sh
+TESTS_ENVIRONMENT = srcdir="$(srcdir)" top_srcdir="$(top_srcdir)" MAKE="$(MAKE) $(AM_MAKEFLAGS)"
commit 2ab77236f87b435d41c5429b7b3059d10058e421
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 15 15:48:57 2008 -0400

    [Makefile.am] Add util to SUBDIRS
    
    We do nothing by default there right now, but it's correct to include it
    anyway.  And we will be installing utilities from there soon (cairo-trace for
    example.)

diff --git a/Makefile.am b/Makefile.am
index 48ac855..d875c3b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,8 @@ include $(top_srcdir)/build/Makefile.am.common
 
 ACLOCAL_AMFLAGS = -I build
 
-DIST_SUBDIRS = src boilerplate test perf doc util
-SUBDIRS = src doc
+DIST_SUBDIRS = src doc util boilerplate test perf
+SUBDIRS = src doc util
 # libpng is required for our test programs
 if CAIRO_HAS_PNG_FUNCTIONS
 SUBDIRS += boilerplate test perf
commit b4bbcda1c31d10d199db86170bcf924947e59ff2
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 15 15:47:53 2008 -0400

    [Makefile.am] Add doc back to SUBDIRS
    
    This reverts cac2ea0fcda2222f36ebd3414f91302dad691b85
    We need doc in SUBDIRS to install docs even if gtk-doc is not available.
    The real fix for the build issue without gtk-doc should go under doc/
    and is coming in a followup commit.

diff --git a/Makefile.am b/Makefile.am
index 13c1862..48ac855 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,11 +3,7 @@ include $(top_srcdir)/build/Makefile.am.common
 ACLOCAL_AMFLAGS = -I build
 
 DIST_SUBDIRS = src boilerplate test perf doc util
-SUBDIRS = src
-# gtk-doc is required for our documentation
-if ENABLE_GTK_DOC
-SUBDIRS += doc
-endif
+SUBDIRS = src doc
 # libpng is required for our test programs
 if CAIRO_HAS_PNG_FUNCTIONS
 SUBDIRS += boilerplate test perf