diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-10-25 14:00:28 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-10-25 14:00:28 +0000 |
| commit | c87348a9223eb0e619fcf6b476fe79ea3ceeb495 (patch) | |
| tree | 81fd8ee7e64704d9d1caea4d540ed0ad0d59fc70 | |
| parent | 0ca1656a2bd0e7a21935968a466fbfed511bdc29 (diff) | |
Use OBJS variable for all object files
There is no longer any need to differentiate the object files
by source type.
Originally committed as revision 15708 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | common.mak | 4 | ||||
| -rw-r--r-- | libavcodec/Makefile | 10 | ||||
| -rw-r--r-- | libavdevice/Makefile | 4 |
4 files changed, 8 insertions, 12 deletions
@@ -46,7 +46,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF) cp -p $< $@ $(STRIP) $@ -SUBDIR_VARS := OBJS ASM_OBJS CPP_OBJS FFLIBS CLEANFILES DIRS TESTS +SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTS define RESET $(1) := diff --git a/common.mak b/common.mak index 59604b2640..d4c1f14862 100644 --- a/common.mak +++ b/common.mak @@ -60,16 +60,12 @@ endif CFLAGS += $(CFLAGS-yes) OBJS += $(OBJS-yes) -ASM_OBJS += $(ASM_OBJS-yes) -CPP_OBJS += $(CPP_OBJS-yes) FFLIBS := $(FFLIBS-yes) $(FFLIBS) TESTS += $(TESTS-yes) FFEXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS) FFLDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS) -OBJS := $(OBJS) $(ASM_OBJS) $(CPP_OBJS) - OBJS := $(addprefix $(SUBDIR),$(OBJS)) TESTS := $(addprefix $(SUBDIR),$(TESTS)) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c9f03c38fa..a5c63a258f 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -420,7 +420,7 @@ OBJS-$(CONFIG_VP6F_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o OBJS-$(CONFIG_WMV3_DECODER) += i386/vc1dsp_mmx.o endif -ASM_OBJS-$(ARCH_ARMV4L) += armv4l/jrevdct_arm.o \ +OBJS-$(ARCH_ARMV4L) += armv4l/jrevdct_arm.o \ armv4l/simple_idct_arm.o \ armv4l/dsputil_arm_s.o \ @@ -434,9 +434,9 @@ OBJS-$(HAVE_ARMV5TE) += armv4l/mpegvideo_armv5te.o \ OBJS-$(HAVE_ARMVFP) += armv4l/float_arm_vfp.o \ -ASM_OBJS-$(HAVE_ARMV5TE) += armv4l/simple_idct_armv5te.o \ +OBJS-$(HAVE_ARMV5TE) += armv4l/simple_idct_armv5te.o \ -ASM_OBJS-$(HAVE_ARMV6) += armv4l/simple_idct_armv6.o \ +OBJS-$(HAVE_ARMV6) += armv4l/simple_idct_armv6.o \ OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \ sparc/simple_idct_vis.o \ @@ -448,7 +448,7 @@ OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \ alpha/mpegvideo_alpha.o \ alpha/simple_idct_alpha.o \ -ASM_OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha_asm.o \ +OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha_asm.o \ alpha/motion_est_mvi_asm.o \ OBJS-$(ARCH_POWERPC) += ppc/dsputil_ppc.o \ @@ -486,7 +486,7 @@ OBJS-$(ARCH_BFIN) += bfin/dsputil_bfin.o \ bfin/mpegvideo_bfin.o \ bfin/vp3_bfin.o \ -ASM_OBJS-$(ARCH_BFIN) += bfin/pixels_bfin.o \ +OBJS-$(ARCH_BFIN) += bfin/pixels_bfin.o \ bfin/fdct_bfin.o \ bfin/idct_bfin.o \ bfin/vp3_idct_bfin.o \ diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 361eda4ff1..655c033b2c 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -20,7 +20,7 @@ OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER) += x11grab.o # external libraries OBJS-$(CONFIG_LIBDC1394_DEMUXER) += libdc1394.o -CPP_OBJS-$(CONFIG_AUDIO_BEOS_DEMUXER) += beosaudio.o -CPP_OBJS-$(CONFIG_AUDIO_BEOS_MUXER) += beosaudio.o +OBJS-$(CONFIG_AUDIO_BEOS_DEMUXER) += beosaudio.o +OBJS-$(CONFIG_AUDIO_BEOS_MUXER) += beosaudio.o include $(SUBDIR)../subdir.mak |