From 18ca9a4a99bde0ab7523b62cc23031f16ca6ab33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Fri, 15 Jun 2007 20:35:37 +0000
Subject: [PATCH] replace TARGET_ARCH_* to ARCH_* for consistency
Originally committed as revision 9322 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
configure | 6 ++----
libavcodec/Makefile | 20 ++++++++++----------
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/configure b/configure
index e8192f32394..3163971e4a9 100755
--- a/configure
+++ b/configure
@@ -1974,14 +1974,12 @@ echo "SLIBPREF=$SLIBPREF" >> config.mak
echo "SLIBSUF=\${BUILDSUF}$SLIBSUF" >> config.mak
echo "EXESUF=\${BUILDSUF}$EXESUF" >> config.mak
-ucarch=`toupper $arch`
-echo "TARGET_ARCH_${ucarch}=yes" >> config.mak
enable $arch
# special cases
case "$arch" in
x86_32|x86_64)
- echo "TARGET_ARCH_X86=yes" >> config.mak
+ echo "ARCH_X86=yes" >> config.mak
echo "#define ARCH_X86 1" >> $TMPH
;;
powerpc)
@@ -1990,7 +1988,7 @@ case "$arch" in
fi
;;
sparc64)
- echo "TARGET_ARCH_SPARC=yes" >> config.mak
+ echo "ARCH_SPARC=yes" >> config.mak
echo "#define ARCH_SPARC 1" >> $TMPH
;;
esac
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 034effe6db1..d34083efc9a 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -345,11 +345,11 @@ OBJS-$(CONFIG_VP5_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
OBJS-$(CONFIG_VP6_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
endif
-ASM_OBJS-$(TARGET_ARCH_ARMV4L) += armv4l/jrevdct_arm.o \
+ASM_OBJS-$(ARCH_ARMV4L) += armv4l/jrevdct_arm.o \
armv4l/simple_idct_arm.o \
armv4l/dsputil_arm_s.o \
-OBJS-$(TARGET_ARCH_ARMV4L) += armv4l/dsputil_arm.o \
+OBJS-$(ARCH_ARMV4L) += armv4l/dsputil_arm.o \
armv4l/mpegvideo_arm.o \
OBJS-$(TARGET_IWMMXT) += armv4l/dsputil_iwmmxt.o \
@@ -360,28 +360,28 @@ ASM_OBJS-$(TARGET_ARMV5TE) += armv4l/simple_idct_armv5te.o \
ASM_OBJS-$(TARGET_ARMV6) += armv4l/simple_idct_armv6.o \
-OBJS-$(TARGET_ARCH_SPARC) += sparc/dsputil_vis.o \
+OBJS-$(ARCH_SPARC) += sparc/dsputil_vis.o \
sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
OBJS-$(HAVE_MLIB) += mlib/dsputil_mlib.o \
-OBJS-$(TARGET_ARCH_ALPHA) += alpha/dsputil_alpha.o \
+OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \
alpha/mpegvideo_alpha.o \
alpha/simple_idct_alpha.o \
alpha/motion_est_alpha.o \
-ASM_OBJS-$(TARGET_ARCH_ALPHA) += alpha/dsputil_alpha_asm.o \
+ASM_OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha_asm.o \
alpha/motion_est_mvi_asm.o \
-OBJS-$(TARGET_ARCH_POWERPC) += ppc/dsputil_ppc.o \
+OBJS-$(ARCH_POWERPC) += ppc/dsputil_ppc.o \
ppc/mpegvideo_ppc.o \
OBJS-$(TARGET_MMI) += ps2/dsputil_mmi.o \
ps2/idct_mmi.o \
ps2/mpegvideo_mmi.o \
-OBJS-$(TARGET_ARCH_SH4) += sh4/idct_sh4.o \
+OBJS-$(ARCH_SH4) += sh4/idct_sh4.o \
sh4/dsputil_sh4.o \
sh4/dsputil_align.o \
@@ -401,10 +401,10 @@ OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o
OBJS-$(CONFIG_WMV3_DECODER) += ppc/vc1dsp_altivec.o
endif
-OBJS-$(TARGET_ARCH_BFIN) += bfin/dsputil_bfin.o \
+OBJS-$(ARCH_BFIN) += bfin/dsputil_bfin.o \
bfin/mpegvideo_bfin.o \
-ASM_OBJS-$(TARGET_ARCH_BFIN) += bfin/pixels_bfin.o \
+ASM_OBJS-$(ARCH_BFIN) += bfin/pixels_bfin.o \
bfin/idct_bfin.o \
bfin/fdct_bfin.o \
@@ -429,7 +429,7 @@ clean::
apiexample $(TESTS)
TESTS= imgresample-test fft-test dct-test
-ifeq ($(TARGET_ARCH_X86),yes)
+ifeq ($(ARCH_X86),yes)
TESTS+= cpuid-test motion-test
endif
--
GitLab