doc: Refactor the build system for complete build dir docs

By structuring things differently, it becomes possible to have a
complete build of the docs in the build dir, without having to install
anything.

Signed-off-by: Sebastian Wick <sebastian.wick@redhat.com>

6 files changed, 0 insertions, 123 deletions

diff --git a/doc/doxygen/dot/wayland-architecture.gv b/doc/doxygen/dot/wayland-architecture.gv
deleted file mode 100644
index f2c3507..0000000
--- a/doc/doxygen/dot/wayland-architecture.gv
+++ /dev/null
@@ -1,36 +0,0 @@
-digraph arch_wayland {
-    edge[
-        fontname="DejaVu Sans",
-        dir="both",
-        arrowtail="dot",
-        arrowsize=.5,
-        fontname="DejaVu Sans",
-        fontsize="18",
-    ]
-
-    node[
-        color=none,
-        margin=0,
-        fontname="DejaVu Sans",
-        fontsize="18",
-   ]
-
-    c1 [label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>Wayland Client</TD></TR></TABLE>>, URL="#c1"]
-    c2 [label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>Wayland Client</TD></TR></TABLE>>, URL="#c2"]
-
-    comp [tooltip="Wayland Compositor", label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD><BR/>Wayland<BR/>Compositor<BR/><BR/></TD></TR></TABLE>>, URL="#comp"]
-
-    impl [tooltip="KMS evdev Kernel", label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>KMS</TD><TD>evdev</TD></TR><TR><TD COLSPAN="2">Kernel</TD></TR></TABLE>>, URL="#impl"]
-
-    c1 -> comp [taillabel="③", labeldistance=2.5, URL="#step_3"];
-    c2 -> comp;
-
-    comp -> c1 [label="②", URL="#step_2"];
-    comp -> c2;
-
-    comp -> impl [xlabel = "④", URL="#step_4"];
-    comp -> impl [style = invis, label="    "];
-    impl -> comp [xlabel = "①", URL="#step_1"];
-
-    c1 -> c2 [style=invis];
-}
diff --git a/doc/doxygen/dot/x-architecture.gv b/doc/doxygen/dot/x-architecture.gv
deleted file mode 100644
index b223d1d..0000000
--- a/doc/doxygen/dot/x-architecture.gv
+++ /dev/null
@@ -1,53 +0,0 @@
-digraph arch_x {
-    edge[
-        fontname="DejaVu Sans",
-        dir="both",
-        arrowtail="dot",
-        arrowsize=.5,
-        fontname="DejaVu Sans",
-        fontsize="18",
-    ]
-
-    node[
-        shape="none",
-        color=none,
-        margin=0,
-        fontname="DejaVu Sans",
-        fontsize="18",
-    ]
-
-    {
-        rank=same;
-        c1 [label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>X Client</TD></TR></TABLE>>, URL="#c1"]
-        c3 [label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>X Client</TD></TR></TABLE>>, URL="#c3"]
-    }
-    c2 [label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>X Client</TD></TR></TABLE>>, URL="#c2"]
-
-    {
-        rank=same;
-        xserver [tooltip="X Server", label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD><BR/>X Server<BR/><BR/></TD></TR></TABLE>>, URL="#xserver"]
-        comp [tooltip="Compositor", label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD><BR/>Compositor<BR/><BR/></TD></TR></TABLE>>, URL="#comp"]
-    }
-
-    impl [tooltip="KMS evdev Kernel", label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>KMS</TD><TD>evdev</TD></TR><TR><TD COLSPAN="2">Kernel</TD></TR></TABLE>>, URL="#impl"]
-
-    c1 -> xserver [taillabel="③", labeldistance=2, URL="#step_3"];
-    c2 -> xserver;
-    c3 -> xserver;
-
-    xserver -> c1 [taillabel="②", labeldistance=2, URL="#step_2"];
-    xserver -> c2;
-    xserver -> c3;
-
-    xserver -> impl [taillabel="⑥", labeldistance=1.75, URL="#step_6"];
-    xserver -> impl [style=invis, label="    "];
-    impl -> xserver [taillabel="①", labeldistance=1.75, URL="#step_1"];
-
-    xserver -> comp [style=invis];
-    xserver -> comp [taillabel="④", labeldistance=1.75, labelangle=-45, URL="#step_4"];
-    comp -> xserver [taillabel="⑤", URL="#step_5"];
-    comp -> xserver [style=invis]
-
-    c1 -> c2 [style=invis];
-    c3 -> c2 [style=invis];
- }
diff --git a/doc/doxygen/meson.build b/doc/doxygen/meson.build
index 6112620..551bd4b 100644
--- a/doc/doxygen/meson.build
+++ b/doc/doxygen/meson.build
@@ -1,16 +1,5 @@
 # Here be dragons
 
-dot_gv = {
-	'wayland-architecture': files('dot/wayland-architecture.gv'),
-	'x-architecture': files('dot/x-architecture.gv'),
-}
-
-# This is a workaround for Meson's custom_target() directive, which
-# currently does not support outputs pointing to a sub-directory
-# XXX: try turning these into maps, so they can be indexed with picture name
-dot_png = []
-dot_map = []
-
 doxygen_conf = configuration_data()
 doxygen_conf.set('VERSION', meson.project_version())
 doxygen_conf.set('top_builddir', meson.project_build_root())
@@ -91,7 +80,6 @@ foreach f_name, sections: formats
 			],
 			input: s_files,
 			output: '@0@.stamp'.format(t_name),
-			depends: [dot_png, dot_map],
 			build_by_default: true,
 		)
 	endforeach
diff --git a/doc/doxygen/xml/Client/meson.build b/doc/doxygen/xml/Client/meson.build
index 849c30d..e51fccb 100644
--- a/doc/doxygen/xml/Client/meson.build
+++ b/doc/doxygen/xml/Client/meson.build
@@ -11,7 +11,6 @@ tgt = custom_target(
 	],
 	input: [ shared_files, client_files ],
 	output: [ 'combine.xslt', 'index.xml' ],
-	depends: [dot_png, dot_map]
 )
 
 doxygen_Client_combine_xslt = tgt[0]
diff --git a/doc/doxygen/xml/Server/meson.build b/doc/doxygen/xml/Server/meson.build
index 4792c1b..5df9744 100644
--- a/doc/doxygen/xml/Server/meson.build
+++ b/doc/doxygen/xml/Server/meson.build
@@ -11,7 +11,6 @@ tgt = custom_target(
 	],
 	input: [ shared_files, server_files ],
 	output: [ 'combine.xslt', 'index.xml' ],
-	depends: [dot_png, dot_map]
 )
 
 doxygen_Server_combine_xslt = tgt[0]
diff --git a/doc/doxygen/xml/meson.build b/doc/doxygen/xml/meson.build
index 6d55c53..479af8e 100644
--- a/doc/doxygen/xml/meson.build
+++ b/doc/doxygen/xml/meson.build
@@ -1,22 +1,2 @@
-# dot_png: list of PNG targets
-# dot_map: list of MAP targets
-foreach name, infile: dot_gv
-	dot_png += custom_target(
-		name + '.png',
-		command: [ dot, '-Tpng', '-o@OUTPUT@', '@INPUT@' ],
-		input: infile,
-		output: name + '.png',
-		install: true,
-		install_dir: join_paths(publican_install_prefix, publican_html_dir, 'images')
-	)
-
-	dot_map += custom_target(
-		name + '.map',
-		command: [ dot, '-Tcmapx_np', '-o@OUTPUT@', '@INPUT@' ],
-		input: infile,
-		output: name + '.map',
-	)
-endforeach
-
 subdir('Client')
 subdir('Server')