[FFmpeg-devel] [PATCH v2] build: add install targets for the examples

[Clément Bœsch]

On Thu, Oct 05, 2017 at 12:55:19AM -0300, James Almer wrote:
> Split it off from install-data.
> 
> Among other things, this prevents spamming triplicate log lines during install.
> 
> Signed-off-by: James Almer <jamrial at gmail.com>
> ---
> Updated to apply after a recent merge.
> 
>  Makefile              |  6 ++----
>  doc/examples/Makefile | 14 +++++++++++++-
>  2 files changed, 15 insertions(+), 5 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 3007da50f7..4a1253a052 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -120,11 +120,9 @@ install: install-libs install-headers
>  
>  install-libs: install-libs-yes
>  
> -install-data: $(DATA_FILES) $(EXAMPLES_FILES) $(EXAMPLE_MAKEFILE)
> -	$(Q)mkdir -p "$(DATADIR)/examples"
> +install-data: $(DATA_FILES)
> +	$(Q)mkdir -p "$(DATADIR)"
>  	$(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
> -	$(INSTALL) -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples"
> -	$(INSTALL) -m 644 $(EXAMPLE_MAKEFILE:%=%.example) "$(DATADIR)/examples/Makefile"
>  
>  uninstall: uninstall-libs uninstall-headers uninstall-data
>  
> diff --git a/doc/examples/Makefile b/doc/examples/Makefile
> index af000d9ddb..58afd71b85 100644
> --- a/doc/examples/Makefile
> +++ b/doc/examples/Makefile
> @@ -26,8 +26,8 @@ ALL_EXAMPLES   := $(EXAMPLES) $(EXAMPLES-:%=doc/examples/%$(PROGSSUF)$(EXESUF))
>  ALL_EXAMPLES_G := $(EXAMPLES_G) $(EXAMPLES-:%=doc/examples/%$(PROGSSUF)_g$(EXESUF))
>  PROGS          += $(EXAMPLES)
>  
> -EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examples/README
>  EXAMPLE_MAKEFILE := $(SRC_PATH)/doc/examples/Makefile
> +EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examples/README $(EXAMPLE_MAKEFILE)
>  
>  $(foreach P,$(EXAMPLES),$(eval OBJS-$(P:%$(PROGSSUF)$(EXESUF)=%) = $(P:%$(PROGSSUF)$(EXESUF)=%).o))
>  $(EXAMPLES_G): %$(PROGSSUF)_g$(EXESUF): %.o
> @@ -39,6 +39,18 @@ OBJDIRS += doc/examples
>  
>  DOXY_INPUT += $(EXAMPLES:%$(PROGSSUF)$(EXESUF)=%.c)
>  
> +install: install-examples
> +
> +install-examples: $(EXAMPLES_FILES)

> +	$(Q)mkdir -p "$(DATADIR)/examples"

I think you're supposed to use $(INSTALL) -d

[...]

Rest should be fine

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20171005/71f4ef0d/attachment.sig>