From: Diego Biurrun Date: Wed, 25 Jul 2012 11:25:58 +0000 (+0200) Subject: build: Rename YASMDEP variable to DEPYASM for consistency X-Git-Tag: n1.1-dev~9^2~676 X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/755834e94f46eb1c0cdba28cccf2475ecec3662b build: Rename YASMDEP variable to DEPYASM for consistency --- diff --git a/Makefile b/Makefile index 3716e9e..37faa76 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ ifndef V Q = @ ECHO = printf "$(1)\t%s\n" $(2) BRIEF = CC AS YASM AR LD HOSTCC -SILENT = DEPCC DEPAS DEPHOSTCC YASMDEP RM RANLIB +SILENT = DEPCC DEPAS DEPHOSTCC DEPYASM RM RANLIB MSG = $@ M = @$(call ECHO,$(TAG),$@); $(foreach VAR,$(BRIEF), \ diff --git a/configure b/configure index 715e49b..6945152 100755 --- a/configure +++ b/configure @@ -3411,7 +3411,7 @@ DEPCCFLAGS=$DEPCCFLAGS \$(CPPFLAGS) DEPAS=$as DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS) YASM=$yasmexe -YASMDEP=$yasmexe +DEPYASM=$yasmexe AR=$ar RANLIB=$ranlib LN_S=$ln_s diff --git a/library.mak b/library.mak index 6159799..cd3fdc2 100644 --- a/library.mak +++ b/library.mak @@ -17,7 +17,7 @@ $(SUBDIR)%-test.o: $(SUBDIR)%.c $(COMPILE_C) $(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm - $(YASMDEP) $(YASMFLAGS) -I $( $(@:.o=.d) + $(DEPYASM) $(YASMFLAGS) -I $( $(@:.o=.d) $(YASM) $(YASMFLAGS) -I $(