]> git.sesse.net Git - ffmpeg/blobdiff - libavcodec/Makefile
Pass correct CPU flags to compilation of sparc/simple_idct_vis.o.
[ffmpeg] / libavcodec / Makefile
index 1abdea7259bf08ae87fed803c1f1fd6ccdfd20b9..e8bebad79680cffdd8af967d2cea7b9bf32597bb 100644 (file)
@@ -4,36 +4,38 @@
 #
 include ../config.mak
 
-CFLAGS+=-I$(SRC_PATH)/libswscale -I$(SRC_PATH)/libavcodec
-
-OBJS= bitstream.o \
-      utils.o \
-      allcodecs.o \
-      mpegvideo.o \
-      jrevdct.o \
-      jfdctfst.o \
-      jfdctint.o\
-      resample.o \
-      resample2.o \
-      dsputil.o \
-      imgconvert.o \
-      mpeg12.o mpeg12data.o \
-      simple_idct.o \
-      eval.o \
-      error_resilience.o \
-      raw.o \
-      faandct.o \
-      parser.o \
-      opt.o \
-      bitstream_filter.o \
-      audioconvert.o \
+CFLAGS += -I$(SRC_PATH)/libswscale -I$(SRC_PATH)/libavcodec
+
+OBJS = allcodecs.o \
+       audioconvert.o \
+       bitstream.o \
+       bitstream_filter.o \
+       dsputil.o \
+       error_resilience.o \
+       eval.o \
+       faandct.o \
+       imgconvert.o \
+       jrevdct.o \
+       jfdctfst.o \
+       jfdctint.o\
+       mpeg12.o mpeg12data.o \
+       mpegvideo.o \
+       opt.o \
+       parser.o \
+       raw.o \
+       resample.o \
+       resample2.o \
+       simple_idct.o \
+       utils.o \
 
 
 HEADERS = avcodec.h opt.h
 
 OBJS-$(CONFIG_AASC_DECODER)            += aasc.o
+OBJS-$(CONFIG_AC3_DECODER)             += ac3dec.o ac3tab.o ac3.o mdct.o fft.o
 OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc.o ac3tab.o ac3.o
 OBJS-$(CONFIG_ALAC_DECODER)            += alac.o
+OBJS-$(CONFIG_APE_DECODER)             += apedec.o
 OBJS-$(CONFIG_ASV1_DECODER)            += asv1.o
 OBJS-$(CONFIG_ASV1_ENCODER)            += asv1.o
 OBJS-$(CONFIG_ASV2_DECODER)            += asv1.o
@@ -52,7 +54,7 @@ OBJS-$(CONFIG_COOK_DECODER)            += cook.o mdct.o fft.o
 OBJS-$(CONFIG_CSCD_DECODER)            += cscd.o
 OBJS-$(CONFIG_CYUV_DECODER)            += cyuv.o
 OBJS-$(CONFIG_DCA_DECODER)             += dca.o
-OBJS-$(CONFIG_DNXHD_DECODER)           += dnxhddec.o
+OBJS-$(CONFIG_DNXHD_DECODER)           += dnxhddec.o dnxhddata.o
 OBJS-$(CONFIG_DSICINVIDEO_DECODER)     += dsicinav.o
 OBJS-$(CONFIG_DSICINAUDIO_DECODER)     += dsicinav.o
 OBJS-$(CONFIG_DVBSUB_DECODER)          += dvbsubdec.o
@@ -84,8 +86,8 @@ OBJS-$(CONFIG_H263_DECODER)            += h263dec.o h263.o
 OBJS-$(CONFIG_H263I_DECODER)           += h263dec.o h263.o
 OBJS-$(CONFIG_H263_ENCODER)            += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o
 OBJS-$(CONFIG_H263P_ENCODER)           += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o
-OBJS-$(CONFIG_H264_DECODER)            += h264.o h264idct.o cabac.o golomb.o
-OBJS-$(CONFIG_H264_ENCODER)            += h264enc.o h264dsp.o
+OBJS-$(CONFIG_H264_DECODER)            += h264.o h264idct.o h264pred.o cabac.o golomb.o
+OBJS-$(CONFIG_H264_ENCODER)            += h264enc.o h264dspenc.o
 OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.o
 OBJS-$(CONFIG_HUFFYUV_ENCODER)         += huffyuv.o
 OBJS-$(CONFIG_IDCIN_DECODER)           += idcinvideo.o
@@ -129,8 +131,8 @@ OBJS-$(CONFIG_PAM_ENCODER)             += pnmenc.o pnm.o
 OBJS-$(CONFIG_PBM_ENCODER)             += pnmenc.o pnm.o
 OBJS-$(CONFIG_PGM_ENCODER)             += pnmenc.o pnm.o
 OBJS-$(CONFIG_PGMYUV_ENCODER)          += pnmenc.o pnm.o
-OBJS-$(CONFIG_PNG_DECODER)             += png.o
-OBJS-$(CONFIG_PNG_ENCODER)             += png.o
+OBJS-$(CONFIG_PNG_DECODER)             += png.o pngdec.o
+OBJS-$(CONFIG_PNG_ENCODER)             += png.o pngenc.o
 OBJS-$(CONFIG_PPM_ENCODER)             += pnmenc.o pnm.o
 OBJS-$(CONFIG_PTX_DECODER)             += ptx.o
 OBJS-$(CONFIG_QDM2_DECODER)            += qdm2.o mdct.o fft.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
@@ -166,7 +168,7 @@ OBJS-$(CONFIG_SONIC_LS_ENCODER)        += sonic.o golomb.o
 OBJS-$(CONFIG_SP5X_DECODER)            += sp5xdec.o mjpegdec.o mjpeg.o
 OBJS-$(CONFIG_SVQ1_DECODER)            += svq1dec.o svq1.o h263.o
 OBJS-$(CONFIG_SVQ1_ENCODER)            += svq1enc.o svq1.o motion_est.o h263.o
-OBJS-$(CONFIG_SVQ3_DECODER)            += h264.o h264idct.o cabac.o golomb.o
+OBJS-$(CONFIG_SVQ3_DECODER)            += h264.o h264idct.o h264pred.o cabac.o golomb.o
 OBJS-$(CONFIG_TARGA_DECODER)           += targa.o
 OBJS-$(CONFIG_TARGA_ENCODER)           += targaenc.o rle.o
 OBJS-$(CONFIG_THEORA_DECODER)          += vp3.o xiph.o vp3dsp.o
@@ -210,6 +212,7 @@ OBJS-$(CONFIG_XAN_DPCM_DECODER)        += dpcm.o
 OBJS-$(CONFIG_XAN_WC3_DECODER)         += xan.o
 OBJS-$(CONFIG_XAN_WC4_DECODER)         += xan.o
 OBJS-$(CONFIG_XL_DECODER)              += xl.o
+OBJS-$(CONFIG_XSUB_DECODER)            += xsubdec.o
 OBJS-$(CONFIG_ZLIB_DECODER)            += lcldec.o
 OBJS-$(CONFIG_ZLIB_ENCODER)            += lclenc.o
 OBJS-$(CONFIG_ZMBV_DECODER)            += zmbv.o
@@ -312,23 +315,24 @@ OBJS-$(CONFIG_H263_PARSER)             += h263_parser.o
 OBJS-$(CONFIG_H264_PARSER)             += h264_parser.o
 OBJS-$(CONFIG_MJPEG_PARSER)            += mjpeg_parser.o
 OBJS-$(CONFIG_MPEG4VIDEO_PARSER)       += mpeg4video_parser.o h263.o
-OBJS-$(CONFIG_MPEGAUDIO_PARSER)        += mpegaudio_parser.o mpegaudiodecheader.o
+OBJS-$(CONFIG_MPEGAUDIO_PARSER)        += mpegaudio_parser.o mpegaudiodecheader.o mpegaudiodata.o
 OBJS-$(CONFIG_MPEGVIDEO_PARSER)        += mpegvideo_parser.o
 OBJS-$(CONFIG_PNM_PARSER)              += pnm_parser.o pnm.o
 OBJS-$(CONFIG_VC1_PARSER)              += vc1_parser.o
 
 OBJS-$(CONFIG_DUMP_EXTRADATA_BSF)      += dump_extradata_bsf.o
-OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF)    += remove_extradata_bsf.o
-OBJS-$(CONFIG_NOISE_BSF)               += noise_bsf.o
+OBJS-$(CONFIG_H264_MP4TOANNEXB_BSF)    += h264_mp4toannexb_bsf.o
+OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF)     += imx_dump_header_bsf.o
+OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF)  += mjpega_dump_header_bsf.o
 OBJS-$(CONFIG_MP3_HEADER_COMPRESS_BSF) += mp3_header_compress_bsf.o
 OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF) += mp3_header_decompress_bsf.o mpegaudiodata.o
-OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF)  += mjpega_dump_header_bsf.o
-OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF)     += imx_dump_header_bsf.o
+OBJS-$(CONFIG_NOISE_BSF)               += noise_bsf.o
+OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF)    += remove_extradata_bsf.o
 
+OBJS-$(HAVE_BEOSTHREADS)               += beosthread.o
+OBJS-$(HAVE_OS2THREADS)                += os2thread.o
 OBJS-$(HAVE_PTHREADS)                  += pthread.o
 OBJS-$(HAVE_W32THREADS)                += w32thread.o
-OBJS-$(HAVE_OS2THREADS)                += os2thread.o
-OBJS-$(HAVE_BEOSTHREADS)               += beosthread.o
 
 OBJS-$(HAVE_XVMC_ACCEL)                += xvmcvideo.o
 
@@ -350,6 +354,7 @@ OBJS += i386/fdct_mmx.o \
         i386/fft_3dn2.o \
 
 OBJS-$(CONFIG_GPL)                     += i386/idct_mmx.o
+
 OBJS-$(CONFIG_CAVS_DECODER)            += i386/cavsdsp_mmx.o
 OBJS-$(CONFIG_SNOW_DECODER)            += i386/snowdsp_mmx.o
 OBJS-$(CONFIG_VP3_DECODER)             += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
@@ -374,15 +379,16 @@ ASM_OBJS-$(HAVE_ARMV5TE)               += armv4l/simple_idct_armv5te.o \
 ASM_OBJS-$(HAVE_ARMV6)                 += armv4l/simple_idct_armv6.o \
 
 OBJS-$(ARCH_SPARC)                     += sparc/dsputil_vis.o \
+                                          sparc/simple_idct_vis.o \
 
-sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
+sparc/dsputil_vis.o sparc/simple_idct_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
 
 OBJS-$(HAVE_MLIB)                      += mlib/dsputil_mlib.o \
 
 OBJS-$(ARCH_ALPHA)                     += alpha/dsputil_alpha.o     \
+                                          alpha/motion_est_alpha.o  \
                                           alpha/mpegvideo_alpha.o   \
                                           alpha/simple_idct_alpha.o \
-                                          alpha/motion_est_alpha.o  \
 
 ASM_OBJS-$(ARCH_ALPHA)                 += alpha/dsputil_alpha_asm.o  \
                                           alpha/motion_est_mvi_asm.o \
@@ -395,17 +401,17 @@ OBJS-$(HAVE_MMI)                       += ps2/dsputil_mmi.o   \
                                           ps2/mpegvideo_mmi.o \
 
 OBJS-$(ARCH_SH4)                       += sh4/idct_sh4.o      \
-                                          sh4/dsputil_sh4.o   \
                                           sh4/dsputil_align.o \
+                                          sh4/dsputil_sh4.o   \
 
 OBJS-$(HAVE_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/fft_altivec.o          \
                                           ppc/float_altivec.o        \
+                                          ppc/gmc_altivec.o          \
+                                          ppc/idct_altivec.o         \
                                           ppc/int_altivec.o          \
+                                          ppc/mpegvideo_altivec.o    \
 
 ifeq ($(HAVE_ALTIVEC),yes)
 OBJS-$(CONFIG_H264_DECODER)            += ppc/h264_altivec.o
@@ -418,8 +424,8 @@ OBJS-$(ARCH_BFIN)                      += bfin/dsputil_bfin.o \
                                           bfin/mpegvideo_bfin.o \
 
 ASM_OBJS-$(ARCH_BFIN)                  += bfin/pixels_bfin.o \
-                                          bfin/idct_bfin.o   \
                                           bfin/fdct_bfin.o   \
+                                          bfin/idct_bfin.o   \
 
 EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
 
@@ -431,10 +437,11 @@ include ../common.mak
 
 clean::
        rm -f \
-          i386/*.o i386/*~ \
+          alpha/*.o alpha/*~ \
           armv4l/*.o armv4l/*~ \
+          bfin/*.o bfin/*~ \
+          i386/*.o i386/*~ \
           mlib/*.o mlib/*~ \
-          alpha/*.o alpha/*~ \
           ppc/*.o ppc/*~ \
           ps2/*.o ps2/*~ \
           sh4/*.o sh4/*~ \
@@ -453,13 +460,13 @@ apiexample: apiexample.o $(LIB)
 cpuid-test: i386/cputest.c
        $(CC) $(CFLAGS) -DTEST -o $@ $<
 
+dct-test: dct-test.o fdctref.o $(LIB)
+
+fft-test: fft-test.o $(LIB)
+
 imgresample-test: imgresample.c $(LIB)
        $(CC) $(CFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
 
-dct-test: dct-test.o fdctref.o $(LIB)
-
 motion-test: motion-test.o $(LIB)
 
-fft-test: fft-test.o $(LIB)
-
 .PHONY: tests