Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build documentation with meson #172

Merged
merged 7 commits into from
Feb 1, 2018
Merged

build documentation with meson #172

merged 7 commits into from
Feb 1, 2018

Conversation

ceyusa
Copy link
Contributor

@ceyusa ceyusa commented Jan 22, 2018

This pull request aims for building the documentation with meson.

In order to achieve it, it is required to move from using environment variables for passing Doxygen configuration, to the configuration template generation. In the case of autotools, sed is used.

@xhaihao
Copy link
Contributor

xhaihao commented Jan 31, 2018

It always re-generate the docs when running ninja even if I don't change any files.

Instead of passing environment variables to the Doxygen process,
Doxyfile will be autogenerated from Doxyfile.in template.
Since they are not handled by the install target
Instead of using conditional compilation for generarte documentation,
this patch will block parsing Makefile in doc subdirectory if the
documentation is not enabled.

This patch will make compilation a bit faster when documentation is
not generated.
Add to the clean target the removal of the generated documentation.

Also use $(RM) for calling the command rm, which is a bit more
portable.
@ceyusa
Copy link
Contributor Author

ceyusa commented Jan 31, 2018

It always re-generate the docs when running ninja even if I don't change any files.

Fixed

@xhaihao xhaihao merged commit 2e41bfd into intel:master Feb 1, 2018
@xhaihao
Copy link
Contributor

xhaihao commented Feb 1, 2018

@ceyusa 'make distclean' is broken now, the regression is caused by f17486f

Makefile:496: ../drm/.deps/va_drm_utils.Plo: No such file or directory
make[2]: *** No rule to make target '../drm/.deps/va_drm_utils.Plo'.  Stop.

@ceyusa
Copy link
Contributor Author

ceyusa commented Feb 1, 2018

oops! true! subdir-objects wasn't a good idea

--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,7 @@ AC_INIT([libva],
 
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects -Wno-portability])
+AM_INIT_AUTOMAKE([dist-bzip2 -Wno-portability])
 
 AC_CONFIG_HEADERS([config.h])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

Does that work for you?
Should I make a pull request for it?

@xhaihao
Copy link
Contributor

xhaihao commented Feb 1, 2018

yes, it works without subdir-objects, please submit a pull request. thanks

xhaihao pushed a commit that referenced this pull request Feb 2, 2018
There is an error below when running 'make distclean':

Makefile:496: ../drm/.deps/va_drm_utils.Plo: No such file or directory
make[2]: *** No rule to make target '../drm/.deps/va_drm_utils.Plo'.
Stop.

The regression is caused by f17486f which added subdir-objects to
AM_INIT_AUTOMAKE.

This patch comes from
#172 (comment)

Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
@xhaihao
Copy link
Contributor

xhaihao commented Feb 2, 2018

@ceyusa I pushed your patch

taowan1 pushed a commit to projectceladon/libva that referenced this pull request Sep 4, 2019
There is an error below when running 'make distclean':

Makefile:496: ../drm/.deps/va_drm_utils.Plo: No such file or directory
make[2]: *** No rule to make target '../drm/.deps/va_drm_utils.Plo'.
Stop.

The regression is caused by f17486f which added subdir-objects to
AM_INIT_AUTOMAKE.

This patch comes from
intel/libva#172 (comment)

Change-Id: I933d8b066dbc5cfe3ea8f890003409d7396573e4
Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Signed-off-by: Romli, Khairul Anuar <khairul.anuar.romli@intel.com>
Tracked-On: OAM-59281
Reviewed-on: 621493
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants