--- Makefile | 4 ++-- configure | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile index fef304f..348f876 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,7 @@ endef COMPILE_C = $(call COMPILE,CC) COMPILE_S = $(call COMPILE,AS) COMPILE_M = $(call COMPILE,OBJCC) +COMPILE_ASM = $(call COMPILE,ASM) COMPILE_HOSTC = $(call COMPILE,HOSTCC) %.o: %.c @@ -57,8 +58,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC) $(COMPILE_HOSTC) %.o: %.asm - $(DEPASM) $(ASMFLAGS) -M -o $@ $< > $(@:.o=.d) - $(ASM) $(ASMFLAGS) -o $@ $< + $(COMPILE_ASM) -$(STRIP) $(STRIPFLAGS) $@ %.i: %.c diff --git a/configure b/configure index 4d5dcf3..8f6a063 100755 --- a/configure +++ b/configure @@ -2548,6 +2548,7 @@ CC_O='-o $@' OBJCC_C='-c' OBJCC_E='-E -o $@' OBJCC_O='-o $@' +ASM_O='-o $@' LD_O='-o $@' LD_LIB='-l%' LD_PATH='-L' @@ -4382,9 +4383,11 @@ EOF if check_cmd $asmexe --version; then enabled x86_64 && asm_extra="-m amd64" asm_debug="-g dwarf2" + ASMDEP='$(DEPASM) $(ASMFLAGS) -M -o $@ $< > $(@:.o=.d)' elif check_cmd nasm -v; then asm=nasm asm_debug="-g -F dwarf" + ASM_DEPFLAGS='-MD $(@:.o=.d)' enabled x86_64 && test "$objformat" = elf && objformat=elf64 fi @@ -5238,6 +5241,7 @@ DEPAS=$as DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS) ASM=$asm DEPASM=$asm +DEPASMFLAGS=\$(ASMFLAGS) AR=$ar ARFLAGS=$arflags AR_O=$ar_o @@ -5256,6 +5260,7 @@ OBJCC_O=$OBJCC_O CC_C=$CC_C CC_E=$CC_E CC_O=$CC_O +ASM_O=$ASM_O LD_O=$LD_O LD_LIB=$LD_LIB LD_PATH=$LD_PATH @@ -5278,8 +5283,11 @@ CCDEP=$CCDEP CCDEP_FLAGS=$CCDEP_FLAGS ASDEP=$ASDEP ASDEP_FLAGS=$ASDEP_FLAGS +ASMDEP=$ASMDEP +ASMDEP_FLAGS=$ASMDEP_FLAGS CC_DEPFLAGS=$CC_DEPFLAGS AS_DEPFLAGS=$AS_DEPFLAGS +ASM_DEPFLAGS=$ASM_DEPFLAGS HOSTCC=$host_cc HOSTLD=$host_ld HOSTCFLAGS=$host_cflags -- 2.1.4 _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel