diff --git a/build/mktargets.py b/build/mktargets.py index 1b9054cf..a904b4fc 100755 --- a/build/mktargets.py +++ b/build/mktargets.py @@ -142,11 +142,11 @@ if len(asm) > 0: if len(sfiles) > 0: f.write("ifeq ($(ASM_ARCH), arm)\n") - f.write("%s_ASM_S_SRCS=\\\n"%(PREFIX)) + f.write("%s_ASM_ARM_SRCS=\\\n"%(PREFIX)) for c in sfiles: f.write("\t$(%s_SRCDIR)/%s\\\n"%(PREFIX, c)) f.write("\n") - f.write("%s_OBJS += $(%s_ASM_S_SRCS:.S=.$(OBJ))\n"%(PREFIX, PREFIX)) + f.write("%s_OBJS += $(%s_ASM_ARM_SRCS:.S=.$(OBJ))\n"%(PREFIX, PREFIX)) f.write("endif\n\n") f.write("OBJS += $(%s_OBJS)\n"%PREFIX) diff --git a/codec/common/targets.mk b/codec/common/targets.mk index 3dfb45bd..a942155d 100644 --- a/codec/common/targets.mk +++ b/codec/common/targets.mk @@ -25,13 +25,13 @@ COMMON_OBJS += $(COMMON_ASM_SRCS:.asm=.$(OBJ)) endif ifeq ($(ASM_ARCH), arm) -COMMON_ASM_S_SRCS=\ +COMMON_ASM_ARM_SRCS=\ $(COMMON_SRCDIR)/arm/copy_mb_neon.S\ $(COMMON_SRCDIR)/arm/deblocking_neon.S\ $(COMMON_SRCDIR)/arm/expand_picture_neon.S\ $(COMMON_SRCDIR)/arm/mc_neon.S\ -COMMON_OBJS += $(COMMON_ASM_S_SRCS:.S=.$(OBJ)) +COMMON_OBJS += $(COMMON_ASM_ARM_SRCS:.S=.$(OBJ)) endif OBJS += $(COMMON_OBJS) diff --git a/codec/decoder/targets.mk b/codec/decoder/targets.mk index c7aa029c..d6953b92 100644 --- a/codec/decoder/targets.mk +++ b/codec/decoder/targets.mk @@ -35,11 +35,11 @@ DECODER_OBJS += $(DECODER_ASM_SRCS:.asm=.$(OBJ)) endif ifeq ($(ASM_ARCH), arm) -DECODER_ASM_S_SRCS=\ +DECODER_ASM_ARM_SRCS=\ $(DECODER_SRCDIR)/core/arm/block_add_neon.S\ $(DECODER_SRCDIR)/core/arm/intra_pred_neon.S\ -DECODER_OBJS += $(DECODER_ASM_S_SRCS:.S=.$(OBJ)) +DECODER_OBJS += $(DECODER_ASM_ARM_SRCS:.S=.$(OBJ)) endif OBJS += $(DECODER_OBJS) diff --git a/codec/encoder/targets.mk b/codec/encoder/targets.mk index 028b0d0b..52d3324a 100644 --- a/codec/encoder/targets.mk +++ b/codec/encoder/targets.mk @@ -50,14 +50,14 @@ ENCODER_OBJS += $(ENCODER_ASM_SRCS:.asm=.$(OBJ)) endif ifeq ($(ASM_ARCH), arm) -ENCODER_ASM_S_SRCS=\ +ENCODER_ASM_ARM_SRCS=\ $(ENCODER_SRCDIR)/core/arm/intra_pred_neon.S\ $(ENCODER_SRCDIR)/core/arm/intra_pred_sad_3_opt_neon.S\ $(ENCODER_SRCDIR)/core/arm/memory_neon.S\ $(ENCODER_SRCDIR)/core/arm/pixel_neon.S\ $(ENCODER_SRCDIR)/core/arm/reconstruct_neon.S\ -ENCODER_OBJS += $(ENCODER_ASM_S_SRCS:.S=.$(OBJ)) +ENCODER_OBJS += $(ENCODER_ASM_ARM_SRCS:.S=.$(OBJ)) endif OBJS += $(ENCODER_OBJS) diff --git a/codec/processing/targets.mk b/codec/processing/targets.mk index fc3fbc10..c107d54c 100644 --- a/codec/processing/targets.mk +++ b/codec/processing/targets.mk @@ -31,13 +31,13 @@ PROCESSING_OBJS += $(PROCESSING_ASM_SRCS:.asm=.$(OBJ)) endif ifeq ($(ASM_ARCH), arm) -PROCESSING_ASM_S_SRCS=\ +PROCESSING_ASM_ARM_SRCS=\ $(PROCESSING_SRCDIR)/src/arm/adaptive_quantization.S\ $(PROCESSING_SRCDIR)/src/arm/down_sample_neon.S\ $(PROCESSING_SRCDIR)/src/arm/pixel_sad_neon.S\ $(PROCESSING_SRCDIR)/src/arm/vaa_calc_neon.S\ -PROCESSING_OBJS += $(PROCESSING_ASM_S_SRCS:.S=.$(OBJ)) +PROCESSING_OBJS += $(PROCESSING_ASM_ARM_SRCS:.S=.$(OBJ)) endif OBJS += $(PROCESSING_OBJS)