[apparmor] [patches] avoid building tech doc during build

Seth Arnold seth.arnold at canonical.com
Mon Dec 12 19:41:17 UTC 2016


On Fri, Dec 09, 2016 at 11:48:46PM -0800, Steve Beattie wrote:
> On Wed, Nov 30, 2016 at 03:31:59PM -0800, Steve Beattie wrote:
> > An additional step that I didn't do here would be to
> > remove the pdf from the default build path, to ensure that it doesn't
> > get triggered to build.
> 
> Here's the patch to do that as well, by creating an extra_docs target
> and using it as part of the tarball generation:
> 
> Signed-off-by: Steve Beattie <steve at nxnw.org>

Acked-by: Seth Arnold <seth.arnold at canonical.com>

.. though this needs to add extra_docs to the .PHONY: target in
parser/Makefile to be 'complete'.

Thanks

> ---
>  Makefile        |    2 ++
>  parser/Makefile |    3 ++-
>  2 files changed, 4 insertions(+), 1 deletion(-)
> 
> Index: b/Makefile
> ===================================================================
> --- a/Makefile
> +++ b/Makefile
> @@ -75,6 +75,8 @@ clean:
>  .PHONY: setup
>  setup:
>  	cd $(__SETUP_DIR)/libraries/libapparmor && ./autogen.sh
> +	# parser has an extra doc to build
> +	make -C $(__SETUP_DIR)/parser extra_docs
>  	# libraries/libapparmor needs configure to have run before
>  	# building docs
>  	$(foreach dir, $(filter-out libraries/libapparmor tests, $(DIRS)), \
> Index: b/parser/Makefile
> ===================================================================
> --- a/parser/Makefile
> +++ b/parser/Makefile
> @@ -161,7 +161,8 @@ htmlmanpages:	$(HTMLMANPAGES)
>  
>  pdf:	techdoc.pdf
>  
> -docs:	manpages htmlmanpages pdf
> +docs:	manpages htmlmanpages
> +extra_docs: pdf
>  
>  indep: docs
>  	$(Q)$(MAKE) -C po all
> 
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20161212/0d94789c/attachment.pgp>


More information about the AppArmor mailing list