From 0447eea588b35d0a0366f5542b3ca9c48183a434 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 3 Mar 2008 18:04:16 +0000 Subject: [PATCH] 2008-03-03 Emmanuele Bassi * Makefile.am: Do not recurse into doc if we did not explicitly enabled the documentation build; we just recurse into doc if we are doing a dist or a distcheck. --- ChangeLog | 6 ++++++ Makefile.am | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 37accfc..243929b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-03-03 Emmanuele Bassi + + * Makefile.am: Do not recurse into doc if we did not explicitly + enabled the documentation build; we just recurse into doc if we + are doing a dist or a distcheck. + 2008-02-29 Øyvind Kolås Reuse the numeric id's used for picking actors to avoid the potential diff --git a/Makefile.am b/Makefile.am index 1c1d43c..65b6e57 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,12 @@ NULL = -SUBDIRS = clutter tests doc +SUBDIRS = clutter tests + +if ENABLE_GTK_DOC +SUBDIRS += doc +endif + +DIST_SUBDIRS = clutter tests doc pcfiles = \ clutter-$(CLUTTER_API_VERSION).pc \ -- 2.7.4