aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-03-06 17:14:06 +0000
committerMåns Rullgård <mans@mansr.com>2010-03-06 17:14:06 +0000
commita4aea515b085c8c56058167915a7ca83c0adc46b (patch)
tree89966927d3e87c16d1165bc2df667c1ebde61f0c
parentbbe8fa1f83bc56375989920838c4a931d82ff5e2 (diff)
downloadffmpeg-a4aea515b085c8c56058167915a7ca83c0adc46b.tar.gz
Add YASMDEP variable; use for deps on yasm files
Originally committed as revision 22239 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure1
-rw-r--r--subdir.mak2
2 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index 902332f512..de881b93b2 100755
--- a/configure
+++ b/configure
@@ -2966,6 +2966,7 @@ AS=$as
LD=$ld
DEPCC=$dep_cc
YASM=$yasmexe
+YASMDEP=$yasmexe
AR=$ar
RANLIB=$ranlib
LN_S=$ln_s
diff --git a/subdir.mak b/subdir.mak
index ea91f3fe2d..5774c6d76f 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -31,7 +31,7 @@ $(SUBDIR)%-test.o: $(SUBDIR)%-test.c
$(CC) $(CPPFLAGS) $(CFLAGS) -DTEST -c $$(CC_O) $$^
$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
- $(YASM) $(YASMFLAGS) -I $$(<D)/ -M -o $$@ $$< > $$(@:.o=.d)
+ $(YASMDEP) $(YASMFLAGS) -I $$(<D)/ -M -o $$@ $$< > $$(@:.o=.d)
$(YASM) $(YASMFLAGS) -I $$(<D)/ -o $$@ $$<
clean::