On 15/05/14 18:19, Janne Grunau wrote:
> Removes an ugly $(if) to avoid conflicts with $(FFLIBS-) in the
> top-level MAkefile.
> ---
> common.mak | 2 +-
> configure | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/common.mak b/common.mak
> index c17b5bf..9244fd3 100644
> --- a/common.mak
> +++ b/common.mak
> @@ -8,7 +8,7 @@ all: all-yes
> include $(SRC_PATH)/arch.mak
>
> OBJS += $(OBJS-yes)
> -FFLIBS := $(FFLIBS-$(if $(NAME),$(NAME),no)) $(FFLIBS-yes) $(FFLIBS)
> +FFLIBS := $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS)
> TESTPROGS += $(TESTPROGS-yes)
>
> LDLIBS = $(FFLIBS:%=%$(BUILDSUF))
> diff --git a/configure b/configure
> index 6f84dfa..827cd22 100755
> --- a/configure
> +++ b/configure
> @@ -4604,7 +4604,7 @@ get_version(){
>
> map 'get_version $v' $LIBRARY_LIST
>
> -map 'eval echo "FFLIBS-${v}=\$${v}_deps" >> config.mak' $LIBRARY_LIST
> +map 'eval echo "${v}_FFLIBS=\$${v}_deps" >> config.mak' $LIBRARY_LIST
>
> print_program_libs(){
> eval "program_libs=\$${1}_libs"
>
Seems fine to me.
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
