[vlc-devel] [PATCH v2 1/5] contrib: only use implicit variables for known implicit variables

[Steve Lhomme]

Added this extra first patch to remove $(origin) usage that don't seem 
to make sense.

On 2020-03-18 9:46, Steve Lhomme wrote:
> At least widl/windres are Windows tools that are not defined in GNU Make on
> msys or Linux.
> 
> Neither ranlib or strip have implicit values either when I tested with make -p.
> ---
>   contrib/src/main.mak | 32 ++++++++------------------------
>   1 file changed, 8 insertions(+), 24 deletions(-)
> 
> diff --git a/contrib/src/main.mak b/contrib/src/main.mak
> index 849b69ffba0..85e4dbb8784 100644
> --- a/contrib/src/main.mak
> +++ b/contrib/src/main.mak
> @@ -78,18 +78,10 @@ endif
>   ifneq ($(findstring $(origin AR),undefined default),)
>   AR := ar
>   endif
> -ifneq ($(findstring $(origin RANLIB),undefined default),)
> -RANLIB := ranlib
> -endif
> -ifneq ($(findstring $(origin STRIP),undefined default),)
> -STRIP := strip
> -endif
> -ifneq ($(findstring $(origin WIDL),undefined default),)
> -WIDL := widl
> -endif
> -ifneq ($(findstring $(origin WINDRES),undefined default),)
> -WINDRES := windres
> -endif
> +RANLIB ?= ranlib
> +STRIP ?= strip
> +WIDL ?= widl
> +WINDRES ?= windres
>   else
>   ifneq ($(findstring $(origin CC),undefined default),)
>   CC := $(HOST)-gcc
> @@ -103,18 +95,10 @@ endif
>   ifneq ($(findstring $(origin AR),undefined default),)
>   AR := $(HOST)-ar
>   endif
> -ifneq ($(findstring $(origin RANLIB),undefined default),)
> -RANLIB := $(HOST)-ranlib
> -endif
> -ifneq ($(findstring $(origin STRIP),undefined default),)
> -STRIP := $(HOST)-strip
> -endif
> -ifneq ($(findstring $(origin WIDL),undefined default),)
> -WIDL := $(HOST)-widl
> -endif
> -ifneq ($(findstring $(origin WINDRES),undefined default),)
> -WINDRES := $(HOST)-windres
> -endif
> +RANLIB ?= $(HOST)-ranlib
> +STRIP ?= $(HOST)-strip
> +WIDL ?= $(HOST)-widl
> +WINDRES ?= $(HOST)-windres
>   endif
>   
>   ifdef HAVE_ANDROID
> -- 
> 2.17.1
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>