docs: Fix recursion into doc/ directory

We should always recurse into the doc/ directory; whether we should then
recurse into reference/, cookbook/ and manual/ is a matter of specific
configure-time flags.

diff --git a/Makefile.am b/Makefile.am
index 0e856b0..1a566b9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,7 @@ include $(top_srcdir)/build/autotools/Makefile.am.silent
 
 NULL =
 
-SUBDIRS = build clutter tests po
-
-if BUILD_GTK_DOC
-SUBDIRS += doc
-endif
+SUBDIRS = doc build clutter tests po
 
 DIST_SUBDIRS = build clutter tests doc po
 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7f32061..a80cfc0 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,8 @@
-SUBDIRS = reference
+SUBDIRS =
+
+if BUILD_GTK_DOC
+SUBDIRS += reference
+endif
 
 if ENABLE_DOCS
 SUBDIRS += common cookbook manual