doc-rst: auto-generate: fixed include "output/*.h.rst" content
Include auto-generate reST header files. BTW fixed linux_tv/Makefile.
Signed-off-by: Markus Heiser <markus.heiser@darmarIT.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
diff --git a/Documentation/linux_tv/Makefile b/Documentation/linux_tv/Makefile
index 639b994..688e37d 100644
--- a/Documentation/linux_tv/Makefile
+++ b/Documentation/linux_tv/Makefile
@@ -9,7 +9,10 @@
TARGETS := $(addprefix $(BUILDDIR)/, $(FILES))
-htmldocs: ${TARGETS}
+htmldocs: $(BUILDDIR) ${TARGETS}
+
+$(BUILDDIR):
+ $(Q)mkdir -p $@
# Rule to convert a .h file to inline RST documentation
@@ -40,7 +43,7 @@
$(BUILDDIR)/video.h.rst: ${UAPI}/dvb/video.h ${PARSER} $(SRC_DIR)/video.h.rst.exceptions
@$($(quiet)gen_rst)
-videodev2.h.rst: ${UAPI}/videodev2.h ${PARSER} $(SRC_DIR)/videodev2.h.rst.exceptions
+$(BUILDDIR)/videodev2.h.rst: ${UAPI}/videodev2.h ${PARSER} $(SRC_DIR)/videodev2.h.rst.exceptions
@$($(quiet)gen_rst)
cleandocs:
diff --git a/Documentation/linux_tv/media/dvb/audio_h.rst b/Documentation/linux_tv/media/dvb/audio_h.rst
index bdd9a70..d87be5e 100644
--- a/Documentation/linux_tv/media/dvb/audio_h.rst
+++ b/Documentation/linux_tv/media/dvb/audio_h.rst
@@ -6,8 +6,4 @@
DVB Audio Header File
*********************
-
-.. toctree::
- :maxdepth: 1
-
- ../../audio.h
+.. include:: ../../../output/audio.h.rst
diff --git a/Documentation/linux_tv/media/dvb/ca_h.rst b/Documentation/linux_tv/media/dvb/ca_h.rst
index a7d2215..407f840 100644
--- a/Documentation/linux_tv/media/dvb/ca_h.rst
+++ b/Documentation/linux_tv/media/dvb/ca_h.rst
@@ -6,8 +6,4 @@
DVB Conditional Access Header File
**********************************
-
-.. toctree::
- :maxdepth: 1
-
- ../../ca.h
+.. include:: ../../../output/ca.h.rst
diff --git a/Documentation/linux_tv/media/dvb/dmx_h.rst b/Documentation/linux_tv/media/dvb/dmx_h.rst
index baf129d..65ee8f09 100644
--- a/Documentation/linux_tv/media/dvb/dmx_h.rst
+++ b/Documentation/linux_tv/media/dvb/dmx_h.rst
@@ -6,8 +6,4 @@
DVB Demux Header File
*********************
-
-.. toctree::
- :maxdepth: 1
-
- ../../dmx.h
+.. include:: ../../../output/dmx.h.rst
diff --git a/Documentation/linux_tv/media/dvb/frontend_h.rst b/Documentation/linux_tv/media/dvb/frontend_h.rst
index 7101d6d..97735b2 100644
--- a/Documentation/linux_tv/media/dvb/frontend_h.rst
+++ b/Documentation/linux_tv/media/dvb/frontend_h.rst
@@ -6,8 +6,4 @@
DVB Frontend Header File
************************
-
-.. toctree::
- :maxdepth: 1
-
- ../../frontend.h
+.. include:: ../../../output/frontend.h.rst
diff --git a/Documentation/linux_tv/media/dvb/net_h.rst b/Documentation/linux_tv/media/dvb/net_h.rst
index 09560db..5a5a797 100644
--- a/Documentation/linux_tv/media/dvb/net_h.rst
+++ b/Documentation/linux_tv/media/dvb/net_h.rst
@@ -6,8 +6,4 @@
DVB Network Header File
***********************
-
-.. toctree::
- :maxdepth: 1
-
- ../../net.h
+.. include:: ../../../output/net.h.rst
diff --git a/Documentation/linux_tv/media/dvb/video_h.rst b/Documentation/linux_tv/media/dvb/video_h.rst
index 45c12d2..9d649a7 100644
--- a/Documentation/linux_tv/media/dvb/video_h.rst
+++ b/Documentation/linux_tv/media/dvb/video_h.rst
@@ -6,8 +6,4 @@
DVB Video Header File
*********************
-
-.. toctree::
- :maxdepth: 1
-
- ../../video.h
+.. include:: ../../../output/video.h.rst
diff --git a/Documentation/linux_tv/media/v4l/videodev.rst b/Documentation/linux_tv/media/v4l/videodev.rst
index 4826416..82bac4a 100644
--- a/Documentation/linux_tv/media/v4l/videodev.rst
+++ b/Documentation/linux_tv/media/v4l/videodev.rst
@@ -6,8 +6,4 @@
Video For Linux Two Header File
*******************************
-
-.. toctree::
- :maxdepth: 1
-
- ../../videodev2.h
+.. include:: ../../../output/videodev2.h.rst
