CAVS decoder by (Stefan Gehrer stefan.gehrer gmx.de)

[ffmpeg] / libavcodec / Makefile

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 0344bec2f71d319db5c99c508a2adcaaf4217be5..fd212f4abaae41c2fb4a149ef4fc1e1c99263606 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -32,6 +32,9 @@ 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
@@ -68,6 +71,9 @@ 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
@@ -98,6 +104,9 @@ 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
@@ -180,11 +189,16 @@ 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_VC9_DECODER)$(CONFIG_WMV3_DECODER),)
-    OBJS+= vc9.o
+ifneq ($(CONFIG_VC1_DECODER)$(CONFIG_WMV3_DECODER),)
+    OBJS+= vc1.o
 endif
 ifneq ($(CONFIG_VCR1_DECODER)$(CONFIG_VCR1_ENCODER),)
     OBJS+= vcr1.o
@@ -225,21 +239,34 @@ 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
 
-AMROBJS=
 ifeq ($(AMR_NB),yes)
-ifeq ($(AMR_NB_FIXED),yes)
-AMROBJS= amr.o
-AMREXTRALIBS+= amr/*.o
-AMRLIBS=amrlibs
-CLEANAMR=cleanamr
-else
-AMROBJS= amr.o
 OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
-CLEANAMR=cleanamrfloat
 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
@@ -257,17 +284,6 @@ ifeq ($(HAVE_BEOSTHREADS),yes)
 OBJS+= beosthread.o
 endif
 
-ifeq ($(AMR_WB),yes)
-AMROBJS= amr.o
-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
-OBJS+= $(AMROBJS)
-CLEANAMRWB=cleanamrwbfloat
 ASM_OBJS=
 
 ifeq ($(HAVE_XVMC_ACCEL),yes)
@@ -285,7 +301,7 @@ OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
 endif
 endif
 
-EXTRALIBS += -L../libavutil -lavutil$(BUILDSUF)
+EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
 
 # currently using libdts for dts decoding
 ifeq ($(CONFIG_DTS),yes)
@@ -337,14 +353,19 @@ OBJS += i386/fdct_mmx.o i386/cputest.o \
 ifeq ($(CONFIG_GPL),yes)
 OBJS += i386/idct_mmx_xvid.o
 endif
-ifdef TARGET_BUILTIN_VECTOR
+ifeq ($(TARGET_BUILTIN_VECTOR),yes)
 i386/fft_sse.o: CFLAGS+= -msse
 depend: CFLAGS+= -msse
 endif
-ifdef TARGET_BUILTIN_3DNOW
+ifeq ($(TARGET_BUILTIN_3DNOW),yes)
 i386/fft_3dn.o: CFLAGS+= -m3dnow
+ifeq ($(TARGET_ARCH_X86),yes)
 i386/fft_3dn2.o: CFLAGS+= -march=athlon
 endif
+ifeq ($(TARGET_ARCH_X86_64),yes)
+i386/fft_3dn2.o: CFLAGS+= -march=k8
+endif
+endif
 endif
 
 # armv4l specific stuff
@@ -402,7 +423,6 @@ sparc/%.o: sparc/%.c
 endif
 
 NAME=avcodec
-SUBDIR=libavcodec
 LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVCVERSION)
@@ -410,12 +430,8 @@ LIBMAJOR=$(LAVCMAJOR)
 endif
 TESTS= imgresample-test dct-test motion-test fft-test
 
-EXTRAOBJS = $(AMREXTRALIBS)
-
 include $(SRC_PATH)/common.mak
 
-$(LIB): $(AMRLIBS)
-
 amrlibs:
        $(MAKE) -C amr spclib fipoplib
 
@@ -423,7 +439,7 @@ tests: apiexample cpuid_test $(TESTS)
 
 dsputil.o: dsputil.c dsputil.h
 
-clean:: $(CLEANAMR)
+clean::
        rm -f \
           i386/*.o i386/*~ \
           armv4l/*.o armv4l/*~ \
@@ -434,20 +450,14 @@ clean:: $(CLEANAMR)
           sh4/*.o sh4/*~ \
           sparc/*.o sparc/*~ \
           liba52/*.o liba52/*~ \
+          amr_float/*.o \
           apiexample $(TESTS)
-
-cleanamr:
-       $(MAKE) -C amr clean
-
-cleanamrfloat:
-       rm -f amr_float/*.o
-
-cleanamrwbfloat:
-       $(MAKE) -C amrwb_float -f makefile.gcc clean
+       -$(MAKE) -C amr clean
+       -$(MAKE) -C amrwb_float -f makefile.gcc clean
 
 # api example program
 apiexample: apiexample.c $(LIB)
-       $(CC) $(CFLAGS) -o $@ $< $(LIB) $(LIBAVUTIL) $(EXTRALIBS) -lm
+       $(CC) $(CFLAGS) -o $@ $< $(LIB) $(LIBAVUTIL) $(EXTRALIBS)
 
 # cpuid test
 cpuid_test: i386/cputest.c