Reduce the number of Makefiles in 'doc/'

Continue the effort started by Simon to reduce the overall number of
Makefiles to allow for faster parallel builds.

Change-Id: I7a4a8543a2f1e2781f09fbe0bdea2cc0395d239d
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/11156
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/configure.ac b/configure.ac
index c43d2ac6102c079d1ab5308752e8eb2a0d0a4985..c4162d996d64b810ae184bb4c5c93d9fe1e3972b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -803,12 +803,9 @@ program_transform_name="s&babeltrace2\.bin&babeltrace2&;$program_transform_name"
 AC_SUBST(program_transform_name)
 
 AC_CONFIG_FILES([
-  doc/api/Makefile
   doc/api/libbabeltrace2/Doxyfile
   doc/api/libbabeltrace2/Makefile
-  doc/bindings/Makefile
   doc/bindings/python/Makefile
-  doc/contributing-images/Makefile
   doc/Makefile
   doc/man/asciidoc-attrs.conf
   doc/man/Makefile

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7047f0e5f24e644cac98c77e4922b50802808203..160cd5a9ca9893452c7629b8d67c53bc235fdaab 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,26 @@
 # SPDX-License-Identifier: MIT
 
-SUBDIRS = contributing-images man bindings
+SUBDIRS = man
 
 if ENABLE_API_DOC
-SUBDIRS += api
+SUBDIRS += api/libbabeltrace2
 endif
+
+if ENABLE_PYTHON_BINDINGS_DOC
+SUBDIRS += bindings/python
+endif
+
+EXTRA_DIST = \
+       contributing-images/bt-ref01.png \
+       contributing-images/bt-ref02.png \
+       contributing-images/bt-ref03.png \
+       contributing-images/bt-ref04.png \
+       contributing-images/bt-ref05.png \
+       contributing-images/bt-ref06.png \
+       contributing-images/bt-ref07.png \
+       contributing-images/bt-ref08.png \
+       contributing-images/bt-ref09.png \
+       contributing-images/bt-ref10.png \
+       contributing-images/bt-ref11.png \
+       contributing-images/bt-ref12.png \
+       contributing-images/bt-ref13.png

diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
deleted file mode 100644 (file)
index c5f96ec..0000000
--- a/doc/api/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-SUBDIRS = libbabeltrace2

diff --git a/doc/bindings/Makefile.am b/doc/bindings/Makefile.am
deleted file mode 100644 (file)
index a9d7ab1..0000000
--- a/doc/bindings/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-if ENABLE_PYTHON_BINDINGS_DOC
-SUBDIRS = python
-endif

diff --git a/doc/contributing-images/Makefile.am b/doc/contributing-images/Makefile.am
deleted file mode 100644 (file)
index 338b7bb..0000000
--- a/doc/contributing-images/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-EXTRA_DIST = bt-ref01.png bt-ref02.png bt-ref03.png bt-ref04.png \
-       bt-ref05.png bt-ref06.png bt-ref07.png bt-ref08.png \
-       bt-ref09.png bt-ref10.png bt-ref11.png bt-ref12.png \
-       bt-ref13.png