X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=doc%2Fapi%2Fmeson.build;h=d34c38369474c69a48db8130c0fe124bdb1b990c;hb=d1c7029a529e678b15454068f47d95d347cc3b8b;hp=899e930fa65f3febffbf68e02b21df76e8ae9e3d;hpb=499fe9dfcfc721f327b9f58a0f1d9d15eea6a8ee;p=dpdk.git

diff --git a/doc/api/meson.build b/doc/api/meson.build
index 899e930fa6..d34c383694 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -15,7 +15,7 @@ generate_doxygen = find_program('generate_doxygen.sh')
 generate_examples = find_program('generate_examples.sh')
 generate_css = find_program('doxy-html-custom.sh')
 
-htmldir = join_paths('share', 'doc', 'dpdk')
+htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk')
 
 # due to the following bug: https://github.com/mesonbuild/meson/issues/4107
 # if install is set to true it will override build_by_default and it will
@@ -23,33 +23,39 @@ htmldir = join_paths('share', 'doc', 'dpdk')
 # false it would be impossible to install the docs.
 # So use a configure option for now.
 example = custom_target('examples.dox',
-	output: 'examples.dox',
-	command: [generate_examples, join_paths(meson.source_root(), 'examples'), '@OUTPUT@'],
-	depfile: 'examples.dox.d',
-	install: get_option('enable_docs'),
-	install_dir: htmldir,
-	build_by_default: get_option('enable_docs'))
+        output: 'examples.dox',
+        command: [generate_examples, join_paths(meson.source_root(), 'examples'), '@OUTPUT@'],
+        depfile: 'examples.dox.d',
+        install: get_option('enable_docs'),
+        install_dir: htmldir,
+        build_by_default: get_option('enable_docs'))
 
 cdata = configuration_data()
 cdata.set('VERSION', meson.project_version())
 cdata.set('API_EXAMPLES', join_paths(meson.build_root(), 'doc', 'api', 'examples.dox'))
 cdata.set('OUTPUT', join_paths(meson.build_root(), 'doc', 'api'))
-cdata.set('HTML_OUTPUT', 'api')
+cdata.set('HTML_OUTPUT', 'html')
 cdata.set('TOPDIR', meson.source_root())
 cdata.set('STRIP_FROM_PATH', meson.source_root())
+cdata.set('WARN_AS_ERROR', 'NO')
+if get_option('werror')
+    cdata.set('WARN_AS_ERROR', 'YES')
+endif
 
 doxy_conf = configure_file(input: 'doxy-api.conf.in',
-	output: 'doxy-api.conf',
-	configuration: cdata)
+        output: 'doxy-api.conf',
+        configuration: cdata)
 
 doxy_build = custom_target('doxygen',
-	depends: example,
-	input: doxy_conf,
-	output: 'api',
-	command: [generate_doxygen, '@INPUT@', '@OUTPUT@', generate_css],
-	install: get_option('enable_docs'),
-	install_dir: htmldir,
-	build_by_default: get_option('enable_docs'))
+        depends: example,
+        depend_files: 'doxy-api-index.md',
+        input: doxy_conf,
+        output: 'html',
+        depfile: 'html.d',
+        command: [generate_doxygen, '@INPUT@', '@OUTPUT@', generate_css],
+        install: get_option('enable_docs'),
+        install_dir: htmldir,
+        build_by_default: get_option('enable_docs'))
 
 doc_targets += doxy_build
 doc_target_names += 'Doxygen_API'