summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-10-13 02:45:09 +0200
committerDiego Biurrun <diego@biurrun.de>2017-03-01 10:18:15 +0100
commit3c0efbd03349ae68d3a25a082222652a102e3fd4 (patch)
tree28f032494c0ac083674f594f8dc7253d45b6dc2c /Makefile
parent39e208f4d4756367c7cd2d581847e0c1b8a429c1 (diff)
downloadffmpeg-3c0efbd03349ae68d3a25a082222652a102e3fd4.tar.gz
build: Allow generating dependencies as a side-effect of assembling
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index d140ac392f..6ea8359318 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ CCFLAGS = $(CPPFLAGS) $(CFLAGS)
OBJCFLAGS += $(EOBJCFLAGS)
OBJCCFLAGS = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS)
ASFLAGS := $(CPPFLAGS) $(ASFLAGS)
-X86ASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm
+X86ASMFLAGS += $(IFLAGS:%=%/) -I$(<D)/ -Pconfig.asm
HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS)
LDFLAGS := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS)
@@ -42,6 +42,7 @@ endef
COMPILE_C = $(call COMPILE,CC)
COMPILE_S = $(call COMPILE,AS)
COMPILE_M = $(call COMPILE,OBJCC)
+COMPILE_X86ASM = $(call COMPILE,X86ASM)
COMPILE_HOSTC = $(call COMPILE,HOSTCC)
%.o: %.c
@@ -57,8 +58,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
$(COMPILE_HOSTC)
%.o: %.asm
- $(DEPX86ASM) $(X86ASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
- $(X86ASM) $(X86ASMFLAGS) -I $(<D)/ -o $@ $<
+ $(COMPILE_X86ASM)
-$(STRIP) $(STRIPFLAGS) $@
%.i: %.c