[Ffmpeg-cvslog] r5673 - trunk/libavcodec/Makefile
mru
subversion
Sat Jul 8 18:39:50 CEST 2006
Author: mru
Date: Sat Jul 8 18:39:49 2006
New Revision: 5673
Modified:
trunk/libavcodec/Makefile
Log:
rewrite kconfig-style
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile (original)
+++ trunk/libavcodec/Makefile Sat Jul 8 18:39:49 2006
@@ -23,335 +23,171 @@
HEADERS = avcodec.h
-ifeq ($(CONFIG_AASC_DECODER),yes)
- OBJS+= aasc.o
-endif
-ifeq ($(CONFIG_AC3_ENCODER),yes)
- OBJS+= ac3enc.o
-endif
-ifeq ($(CONFIG_ALAC_DECODER),yes)
- OBJS+= alac.o
-endif
-ifneq ($(CONFIG_ASV1_DECODER)$(CONFIG_ASV1_ENCODER)$(CONFIG_ASV2_DECODER)$(CONFIG_ASV2_ENCODER),)
- OBJS+= asv1.o
-endif
-ifeq ($(CONFIG_AVS_DECODER),yes)
- OBJS+= avs.o
-endif
-ifeq ($(CONFIG_CAVS_DECODER),yes)
- OBJS+= cavs.o cavsdsp.o
-endif
-ifeq ($(CONFIG_CINEPAK_DECODER),yes)
- OBJS+= cinepak.o
-endif
-ifeq ($(CONFIG_COOK_DECODER),yes)
- OBJS+= cook.o
-endif
-ifneq ($(CONFIG_CLJR_DECODER)$(CONFIG_CLJR_ENCODER),)
- OBJS+= cljr.o
-endif
-ifeq ($(CONFIG_CYUV_DECODER),yes)
- OBJS+= cyuv.o
-endif
-ifeq ($(CONFIG_DVBSUB_DECODER),yes)
- OBJS+= dvbsubdec.o
-endif
-ifeq ($(CONFIG_DVBSUB_ENCODER),yes)
- OBJS+= dvbsub.o
-endif
-ifeq ($(CONFIG_DVDSUB_DECODER),yes)
- OBJS+= dvdsub.o
-endif
-ifeq ($(CONFIG_DVDSUB_ENCODER),yes)
- OBJS+= dvdsubenc.o
-endif
-ifneq ($(CONFIG_DVVIDEO_DECODER)$(CONFIG_DVVIDEO_ENCODER),)
- OBJS+= dv.o
-endif
-ifeq ($(CONFIG_EIGHTBPS_DECODER),yes)
- OBJS+= 8bps.o
-endif
-ifneq ($(CONFIG_FFV1_DECODER)$(CONFIG_FFV1_ENCODER),)
- OBJS+= ffv1.o
-endif
-ifeq ($(CONFIG_FLAC_DECODER),yes)
- OBJS+= flac.o
-endif
-ifeq ($(CONFIG_FLAC_ENCODER),yes)
- OBJS+= flacenc.o
-endif
-ifeq ($(CONFIG_FLIC_DECODER),yes)
- OBJS+= flicvideo.o
-endif
-ifeq ($(CONFIG_FOURXM_DECODER),yes)
- OBJS+= 4xm.o
-endif
-ifeq ($(CONFIG_FRAPS_DECODER),yes)
- OBJS+= fraps.o
-endif
-ifneq ($(CONFIG_H261_DECODER)$(CONFIG_H261_ENCODER),)
- OBJS+= h261.o
-endif
-ifneq ($(CONFIG_H264_DECODER)$(CONFIG_SVQ3_DECODER),)
- OBJS+= h264.o
-endif
-ifneq ($(CONFIG_HUFFYUV_DECODER)$(CONFIG_HUFFYUV_ENCODER)$(CONFIG_FFVHUFF_DECODER)$(CONFIG_FFVHUFF_ENCODER),)
- OBJS+= huffyuv.o
-endif
-ifeq ($(CONFIG_IDCIN_DECODER),yes)
- OBJS+= idcinvideo.o
-endif
-ifeq ($(CONFIG_INDEO2_DECODER),yes)
- OBJS+= indeo2.o
-endif
-ifeq ($(CONFIG_INDEO3_DECODER),yes)
- OBJS+= indeo3.o
-endif
-ifeq ($(CONFIG_INTERPLAY_VIDEO_DECODER),yes)
- OBJS+= interplayvideo.o
-endif
-ifeq ($(CONFIG_KMVC_DECODER),yes)
- OBJS+= kmvc.o
-endif
-ifneq ($(CONFIG_MSZH_DECODER)$(CONFIG_ZLIB_DECODER)$(CONFIG_ZLIB_ENCODER),)
- OBJS+= lcl.o
-endif
-ifeq ($(CONFIG_LOCO_DECODER),yes)
- OBJS+= loco.o
-endif
-ifneq ($(CONFIG_MACE3_DECODER)$(CONFIG_MACE6_DECODER),)
- OBJS+= mace.o
-endif
-ifeq ($(CONFIG_MP2_ENCODER),yes)
- OBJS+= mpegaudio.o
-endif
-ifeq ($(CONFIG_MSRLE_DECODER),yes)
- OBJS+= msrle.o
-endif
-ifeq ($(CONFIG_MSVIDEO1_DECODER),yes)
- OBJS+= msvideo1.o
-endif
-ifneq ($(CONFIG_PNG_DECODER)$(CONFIG_PNG_ENCODER),)
- OBJS+= png.o
-endif
-ifeq ($(CONFIG_QDM2_DECODER),yes)
- OBJS+= qdm2.o
-endif
-ifeq ($(CONFIG_QDRAW_DECODER),yes)
- OBJS+= qdrw.o
-endif
-ifeq ($(CONFIG_QPEG_DECODER),yes)
- OBJS+= qpeg.o
-endif
-ifeq ($(CONFIG_QTRLE_DECODER),yes)
- OBJS+= qtrle.o
-endif
-ifeq ($(CONFIG_RA_144_DECODER),yes)
- OBJS+= ra144.o
-endif
-ifeq ($(CONFIG_RA_288_DECODER),yes)
- OBJS+= ra288.o
-endif
-ifeq ($(CONFIG_ROQ_DECODER),yes)
- OBJS+= roqvideo.o
-endif
-ifeq ($(CONFIG_RPZA_DECODER),yes)
- OBJS+= rpza.o
-endif
-ifneq ($(CONFIG_RV10_DECODER)$(CONFIG_RV20_DECODER)$(CONFIG_RV10_ENCODER)$(CONFIG_RV20_ENCODER),)
- OBJS+= rv10.o
-endif
-ifeq ($(CONFIG_SHORTEN_DECODER),yes)
- OBJS+= shorten.o
-endif
-ifneq ($(CONFIG_SMACKER_DECODER)$(CONFIG_SMACKAUD_DECODER),)
- OBJS+= smacker.o
-endif
-ifeq ($(CONFIG_SMC_DECODER),yes)
- OBJS+= smc.o
-endif
-ifneq ($(CONFIG_SNOW_DECODER)$(CONFIG_SNOW_ENCODER),)
- OBJS+= snow.o
-endif
-ifneq ($(CONFIG_SONIC_DECODER)$(CONFIG_SONIC_ENCODER)$(CONFIG_SONIC_LS_ENCODER),)
- OBJS+= sonic.o
-endif
-ifneq ($(CONFIG_SVQ1_DECODER)$(CONFIG_SVQ1_ENCODER),)
- OBJS+= svq1.o
-endif
-ifeq ($(CONFIG_TRUEMOTION1_DECODER),yes)
- OBJS+= truemotion1.o
-endif
-ifeq ($(CONFIG_TRUEMOTION2_DECODER),yes)
- OBJS+= truemotion2.o
-endif
-ifeq ($(CONFIG_TRUESPEECH_DECODER),yes)
- OBJS+= truespeech.o
-endif
-ifeq ($(CONFIG_TTA_DECODER),yes)
- OBJS+= tta.o
-endif
-ifeq ($(CONFIG_TSCC_DECODER),yes)
- OBJS+= tscc.o
-endif
-ifeq ($(CONFIG_CSCD_DECODER),yes)
- OBJS+= cscd.o
- OBJS+= lzo.o
-endif
-ifeq ($(CONFIG_NUV_DECODER),yes)
- OBJS+= nuv.o
- OBJS+= rtjpeg.o
- OBJS+= lzo.o
-endif
-ifeq ($(CONFIG_ULTI_DECODER),yes)
- OBJS+= ulti.o
-endif
-ifneq ($(CONFIG_VC1_DECODER)$(CONFIG_WMV3_DECODER),)
- OBJS+= vc1.o
-endif
-ifneq ($(CONFIG_VCR1_DECODER)$(CONFIG_VCR1_ENCODER),)
- OBJS+= vcr1.o
-endif
-ifneq ($(CONFIG_VMDVIDEO_DECODER)$(CONFIG_VMDAUDIO_DECODER),)
- OBJS+= vmdav.o
-endif
-ifeq ($(CONFIG_VORBIS_DECODER),yes)
- OBJS+= vorbis.o
-endif
-ifneq ($(CONFIG_VP3_DECODER)$(CONFIG_THEORA_DECODER),)
- OBJS+= vp3.o
-endif
-ifeq ($(CONFIG_VQA_DECODER),yes)
- OBJS+= vqavideo.o
-endif
-ifneq ($(CONFIG_WMAV1_DECODER)$(CONFIG_WMAV2_DECODER),)
- OBJS+= wmadec.o
-endif
-ifeq ($(CONFIG_WNV1_DECODER),yes)
- OBJS+= wnv1.o
-endif
-ifeq ($(CONFIG_WS_SND1_DECODER),yes)
- OBJS+= ws-snd1.o
-endif
-ifneq ($(CONFIG_XAN_WC3_DECODER)$(CONFIG_XAN_WC4_DECODER),)
- OBJS+= xan.o
-endif
-ifeq ($(CONFIG_XL_DECODER),yes)
- OBJS+= xl.o
-endif
-ifeq ($(CONFIG_BMP_DECODER),yes)
- OBJS+= bmp.o
-endif
-ifeq ($(CONFIG_MMVIDEO_DECODER),yes)
- OBJS+= mmvideo.o
-endif
-ifeq ($(CONFIG_ZMBV_DECODER),yes)
- OBJS+= zmbv.o
-endif
-ifeq ($(CONFIG_FLASHSV_DECODER),yes)
- OBJS+= flashsv.o
-endif
-
-
-ifeq ($(AMR),yes)
-OBJS+= amr.o
-endif
-
-ifeq ($(AMR_NB),yes)
-OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o \
- amr_float/interf_dec.o amr_float/interf_enc.o
-endif
-
-ifeq ($(AMR_NB_FIXED),yes)
-EXTRAOBJS += amr/*.o
-EXTRADEPS=amrlibs
-endif
-
-ifeq ($(AMR_WB),yes)
-OBJS+= amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
- amrwb_float/dec_if.o amrwb_float/dec_lpc.o amrwb_float/dec_main.o \
- amrwb_float/dec_rom.o amrwb_float/dec_util.o amrwb_float/enc_acelp.o \
- amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o \
- amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \
- amrwb_float/enc_util.o amrwb_float/if_rom.o
-endif
-
-
-ifeq ($(HAVE_PTHREADS),yes)
-OBJS+= pthread.o
-endif
-
-ifeq ($(HAVE_W32THREADS),yes)
-OBJS+= w32thread.o
-endif
-
-ifeq ($(HAVE_OS2THREADS),yes)
-OBJS+= os2thread.o
-endif
-
-
-ifeq ($(HAVE_BEOSTHREADS),yes)
-OBJS+= beosthread.o
-endif
-
-ASM_OBJS=
-
-ifeq ($(HAVE_XVMC_ACCEL),yes)
-OBJS+= xvmcvideo.o
-endif
+OBJS-$(CONFIG_AASC_DECODER) += aasc.o
+OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o
+OBJS-$(CONFIG_ALAC_DECODER) += alac.o
+OBJS-$(CONFIG_ASV1_DECODER) += asv1.o
+OBJS-$(CONFIG_ASV1_ENCODER) += asv1.o
+OBJS-$(CONFIG_ASV2_DECODER) += asv1.o
+OBJS-$(CONFIG_ASV2_ENCODER) += asv1.o
+OBJS-$(CONFIG_AVS_DECODER) += avs.o
+OBJS-$(CONFIG_CAVS_DECODER) += cavs.o cavsdsp.o
+OBJS-$(CONFIG_CINEPAK_DECODER) += cinepak.o
+OBJS-$(CONFIG_COOK_DECODER) += cook.o
+OBJS-$(CONFIG_CLJR_DECODER) += cljr.o
+OBJS-$(CONFIG_CLJR_ENCODER) += cljr.o
+OBJS-$(CONFIG_CYUV_DECODER) += cyuv.o
+OBJS-$(CONFIG_DVBSUB_DECODER) += dvbsubdec.o
+OBJS-$(CONFIG_DVBSUB_ENCODER) += dvbsub.o
+OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsub.o
+OBJS-$(CONFIG_DVDSUB_ENCODER) += dvdsubenc.o
+OBJS-$(CONFIG_DVVIDEO_DECODER) += dv.o
+OBJS-$(CONFIG_DVVIDEO_ENCODER) += dv.o
+OBJS-$(CONFIG_EIGHTBPS_DECODER) += 8bps.o
+OBJS-$(CONFIG_FFV1_DECODER) += ffv1.o
+OBJS-$(CONFIG_FFV1_ENCODER) += ffv1.o
+OBJS-$(CONFIG_FLAC_DECODER) += flac.o
+OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o
+OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.o
+OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o
+OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o
+OBJS-$(CONFIG_H261_DECODER) += h261.o
+OBJS-$(CONFIG_H261_ENCODER) += h261.o
+OBJS-$(CONFIG_H264_DECODER) += h264.o
+OBJS-$(CONFIG_SVQ3_DECODER) += h264.o
+OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o
+OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o
+OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.o
+OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.o
+OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o
+OBJS-$(CONFIG_INDEO2_DECODER) += indeo2.o
+OBJS-$(CONFIG_INDEO3_DECODER) += indeo3.o
+OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o
+OBJS-$(CONFIG_KMVC_DECODER) += kmvc.o
+OBJS-$(CONFIG_MSZH_DECODER) += lcl.o
+OBJS-$(CONFIG_ZLIB_DECODER) += lcl.o
+OBJS-$(CONFIG_ZLIB_ENCODER) += lcl.o
+OBJS-$(CONFIG_LOCO_DECODER) += loco.o
+OBJS-$(CONFIG_MACE3_DECODER) += mace.o
+OBJS-$(CONFIG_MACE6_DECODER) += mace.o
+OBJS-$(CONFIG_MP2_ENCODER) += mpegaudio.o
+OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o
+OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o
+OBJS-$(CONFIG_PNG_DECODER) += png.o
+OBJS-$(CONFIG_PNG_ENCODER) += png.o
+OBJS-$(CONFIG_QDM2_DECODER) += qdm2.o
+OBJS-$(CONFIG_QDRAW_DECODER) += qdrw.o
+OBJS-$(CONFIG_QPEG_DECODER) += qpeg.o
+OBJS-$(CONFIG_QTRLE_DECODER) += qtrle.o
+OBJS-$(CONFIG_RA_144_DECODER) += ra144.o
+OBJS-$(CONFIG_RA_288_DECODER) += ra288.o
+OBJS-$(CONFIG_ROQ_DECODER) += roqvideo.o
+OBJS-$(CONFIG_RPZA_DECODER) += rpza.o
+OBJS-$(CONFIG_RV10_DECODER) += rv10.o
+OBJS-$(CONFIG_RV10_ENCODER) += rv10.o
+OBJS-$(CONFIG_RV20_DECODER) += rv10.o
+OBJS-$(CONFIG_RV20_ENCODER) += rv10.o
+OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.o
+OBJS-$(CONFIG_SMACKER_DECODER) += smacker.o
+OBJS-$(CONFIG_SMACKAUD_DECODER) += smacker.o
+OBJS-$(CONFIG_SMC_DECODER) += smc.o
+OBJS-$(CONFIG_SNOW_DECODER) += snow.o
+OBJS-$(CONFIG_SNOW_ENCODER) += snow.o
+OBJS-$(CONFIG_SONIC_DECODER) += sonic.o
+OBJS-$(CONFIG_SONIC_ENCODER) += sonic.o
+OBJS-$(CONFIG_SONIC_LS_DECODER) += sonic.o
+OBJS-$(CONFIG_SVQ1_DECODER) += svq1.o
+OBJS-$(CONFIG_SVQ1_ENCODER) += svq1.o
+OBJS-$(CONFIG_TRUEMOTION1_DECODER) += truemotion1.o
+OBJS-$(CONFIG_TRUEMOTION2_DECODER) += truemotion2.o
+OBJS-$(CONFIG_TRUESPEECH_DECODER) += truespeech.o
+OBJS-$(CONFIG_TTA_DECODER) += tta.o
+OBJS-$(CONFIG_TSCC_DECODER) += tscc.o
+OBJS-$(CONFIG_CSCD_DECODER) += cscd.o lzo.o
+OBJS-$(CONFIG_NUV_DECODER) += nuv.o rtjpeg.o lzo.o
+OBJS-$(CONFIG_ULTI_DECODER) += ulti.o
+OBJS-$(CONFIG_VC1_DECODER) += vc1.o
+OBJS-$(CONFIG_WMV3_DECODER) += vc1.o
+OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o
+OBJS-$(CONFIG_VCR1_ENCODER) += vcr1.o
+OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdav.o
+OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdav.o
+OBJS-$(CONFIG_VORBIS_DECODER) += vorbis.o
+OBJS-$(CONFIG_VP3_DECODER) += vp3.o
+OBJS-$(CONFIG_THEORA_DECODER) += vp3.o
+OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o
+OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o
+OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o
+OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o
+OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o
+OBJS-$(CONFIG_XAN_WC3_DECODER) += xan.o
+OBJS-$(CONFIG_XAN_WC4_DECODER) += xan.o
+OBJS-$(CONFIG_XL_DECODER) += xl.o
+OBJS-$(CONFIG_BMP_DECODER) += bmp.o
+OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o
+OBJS-$(CONFIG_ZMBV_DECODER) += zmbv.o
+OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.o
+
+OBJS-$(CONFIG_FAAD) += faad.o
+OBJS-$(CONFIG_FAAC) += faac.o
+OBJS-$(CONFIG_XVID) += xvidff.o xvid_rc.o
+OBJS-$(CONFIG_X264) += x264.o
+OBJS-$(CONFIG_MP3LAME) += mp3lameaudio.o
+OBJS-$(CONFIG_LIBVORBIS) += oggvorbis.o
+OBJS-$(CONFIG_LIBTHEORA) += oggtheora.o
+OBJS-$(CONFIG_LIBGSM) += libgsm.o
# currently using liba52 for ac3 decoding
-ifeq ($(CONFIG_AC3),yes)
-OBJS+= a52dec.o
+OBJS-$(CONFIG_AC3) += a52dec.o
# using builtin liba52 or runtime linked liba52.so.0
-ifneq ($(CONFIG_A52BIN),yes)
-OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
- liba52/imdct.o liba52/parse.o liba52/crc.o liba52/resample.o
-endif
-endif
-
-EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
+OBJS-$(CONFIG_AC3)$(CONFIG_A52BIN) += liba52/bit_allocate.o \
+ liba52/bitstream.o \
+ liba52/downmix.o \
+ liba52/imdct.o \
+ liba52/parse.o \
+ liba52/crc.o \
+ liba52/resample.o
# currently using libdts for dts decoding
-ifeq ($(CONFIG_DTS),yes)
-OBJS+= dtsdec.o
-CFLAGS += $(DTS_INC)
-endif
+OBJS-$(CONFIG_DTS) += dtsdec.o
+CFLAGS-$(CONFIG_DTS) += $(DTS_INC)
-ifeq ($(CONFIG_FAAD),yes)
-OBJS+= faad.o
-endif
+OBJS-$(AMR) += amr.o
+OBJS-$(AMR_NB) += amr_float/sp_dec.o \
+ amr_float/sp_enc.o \
+ amr_float/interf_dec.o \
+ amr_float/interf_enc.o
-ifeq ($(CONFIG_FAAC),yes)
-OBJS+= faac.o
-endif
-
-ifeq ($(CONFIG_XVID),yes)
-OBJS+= xvidff.o
-OBJS+= xvid_rc.o
-endif
-
-ifeq ($(CONFIG_X264),yes)
-OBJS+= x264.o
-endif
-
-ifeq ($(CONFIG_MP3LAME),yes)
-OBJS += mp3lameaudio.o
+ifeq ($(AMR_NB_FIXED),yes)
+EXTRAOBJS += amr/*.o
+EXTRADEPS=amrlibs
endif
-ifeq ($(CONFIG_LIBOGG),yes)
-ifeq ($(CONFIG_LIBVORBIS),yes)
-OBJS += oggvorbis.o
-endif
-ifeq ($(CONFIG_LIBTHEORA), yes)
-OBJS += oggtheora.o
-endif
-endif
+OBJS-$(AMR_WB) += amrwb_float/dec_acelp.o \
+ amrwb_float/dec_dtx.o \
+ amrwb_float/dec_gain.o \
+ amrwb_float/dec_if.o \
+ amrwb_float/dec_lpc.o \
+ amrwb_float/dec_main.o \
+ amrwb_float/dec_rom.o \
+ amrwb_float/dec_util.o \
+ amrwb_float/enc_acelp.o \
+ amrwb_float/enc_dtx.o \
+ amrwb_float/enc_gain.o \
+ amrwb_float/enc_if.o \
+ amrwb_float/enc_lpc.o \
+ amrwb_float/enc_main.o \
+ amrwb_float/enc_rom.o \
+ amrwb_float/enc_util.o \
+ amrwb_float/if_rom.o
+
+OBJS-$(HAVE_PTHREADS) += pthread.o
+OBJS-$(HAVE_W32THREADS) += w32thread.o
+OBJS-$(HAVE_OS2THREADS) += os2thread.o
+OBJS-$(HAVE_BEOSTHREADS) += beosthread.o
-ifeq ($(CONFIG_LIBGSM),yes)
-OBJS += libgsm.o
-endif
+OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.o
# i386 mmx specific stuff
ifeq ($(TARGET_MMX),yes)
@@ -379,49 +215,51 @@
endif
# armv4l specific stuff
-ifeq ($(TARGET_ARCH_ARMV4L),yes)
-ASM_OBJS += armv4l/jrevdct_arm.o armv4l/simple_idct_arm.o armv4l/dsputil_arm_s.o
-OBJS += armv4l/dsputil_arm.o armv4l/mpegvideo_arm.o
-ifeq ($(TARGET_IWMMXT),yes)
-OBJS += armv4l/dsputil_iwmmxt.o armv4l/mpegvideo_iwmmxt.o
-endif
-endif
+ASM_OBJS-$(TARGET_ARCH_ARMV4L) += armv4l/jrevdct_arm.o \
+ armv4l/simple_idct_arm.o \
+ armv4l/dsputil_arm_s.o
+OBJS-$(TARGET_ARCH_ARMV4L) += armv4l/dsputil_arm.o \
+ armv4l/mpegvideo_arm.o
+OBJS-$(TARGET_IWMMXT) += armv4l/dsputil_iwmmxt.o \
+ armv4l/mpegvideo_iwmmxt.o
+
+# sun sparc
+OBJS-$(TARGET_ARCH_SPARC) += sparc/dsputil_vis.o
+sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
# sun mediaLib specific stuff
-ifeq ($(HAVE_MLIB),yes)
-OBJS += mlib/dsputil_mlib.o
-CFLAGS += $(MLIB_INC)
-endif
+OBJS-$(HAVE_MLIB) += mlib/dsputil_mlib.o
+CFLAGS-$(HAVE_MLIB) += $(MLIB_INC)
# alpha specific stuff
-ifeq ($(TARGET_ARCH_ALPHA),yes)
-OBJS += alpha/dsputil_alpha.o alpha/mpegvideo_alpha.o \
- alpha/simple_idct_alpha.o alpha/motion_est_alpha.o
-ASM_OBJS += alpha/dsputil_alpha_asm.o alpha/motion_est_mvi_asm.o
-endif
-
-ifeq ($(TARGET_ARCH_POWERPC),yes)
-OBJS += ppc/dsputil_ppc.o ppc/mpegvideo_ppc.o
-endif
+OBJS-$(TARGET_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 \
+ alpha/motion_est_mvi_asm.o
+
+OBJS-$(TARGET_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 \
+ sh4/dsputil_sh4.o \
+ sh4/dsputil_align.o
+OBJS-$(TARGET_ALTIVEC) += ppc/dsputil_altivec.o \
+ ppc/mpegvideo_altivec.o \
+ ppc/idct_altivec.o \
+ ppc/fft_altivec.o \
+ ppc/gmc_altivec.o \
+ ppc/fdct_altivec.o \
+ ppc/dsputil_h264_altivec.o \
+ ppc/dsputil_snow_altivec.o
+
+CFLAGS += $(CFLAGS-yes)
+OBJS += $(OBJS-yes)
+ASM_OBJS += $(ASM_OBJS-yes)
-ifeq ($(TARGET_MMI),yes)
-OBJS += ps2/dsputil_mmi.o ps2/idct_mmi.o ps2/mpegvideo_mmi.o
-endif
-
-ifeq ($(TARGET_ALTIVEC),yes)
-OBJS += ppc/dsputil_altivec.o ppc/mpegvideo_altivec.o ppc/idct_altivec.o \
- ppc/fft_altivec.o ppc/gmc_altivec.o ppc/fdct_altivec.o \
- ppc/dsputil_h264_altivec.o ppc/dsputil_snow_altivec.o
-endif
-
-ifeq ($(TARGET_ARCH_SH4),yes)
-OBJS+= sh4/idct_sh4.o sh4/dsputil_sh4.o sh4/dsputil_align.o
-endif
-
-ifeq ($(TARGET_ARCH_SPARC),yes)
-OBJS+=sparc/dsputil_vis.o
-sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
-endif
+EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
NAME=avcodec
LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)
More information about the ffmpeg-cvslog
mailing list