X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2FMakefile;h=7c791155d38042a4996957bcd0fccbdd3e6264dc;hb=d4f5d74a54183a0198053b0ceb0faa21ad686551;hp=f8be2a83fa7a8bd8255a27ccf8ddd3dcd8afa6b3;hpb=f2598a19a2b16577f41e06ec87e550d33c9e9f37;p=ffmpeg

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index f8be2a83fa7..7c791155d38 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -16,12 +16,26 @@ OBJS= common.o utils.o mem.o allcodecs.o \
       motion_est.o imgconvert.o imgresample.o \
       mpeg12.o mpegaudiodec.o pcm.o simple_idct.o \
       ratecontrol.o adpcm.o eval.o dv.o error_resilience.o \
-      fft.o mdct.o mace.o huffyuv.o cyuv.o opts.o
+      fft.o mdct.o mace.o huffyuv.o cyuv.o opts.o raw.o h264.o golomb.o \
+      vp3.o asv1.o 4xm.o cabac.o ffv1.o ra144.o ra288.o
+
+ifeq ($(AMR_NB),yes)
+ifeq ($(AMR_NB_FIXED),yes)
+OBJS+= amr.o
+AMREXTRALIBS+= amr/*.o
+AMRLIBS=amrlibs
+CLEANAMR=cleanamr
+else
+OBJS+= amr.o amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
+CLEANAMR=cleanamrfloat
+endif
+endif
+
 ASM_OBJS=
 
 # codecs which are patented in some non free countries like the us
 ifeq ($(CONFIG_RISKY),yes)
-OBJS+= h263.o msmpeg4.o h263dec.o svq1.o rv10.o wmadec.o
+OBJS+= h263.o msmpeg4.o h263dec.o svq1.o rv10.o wmadec.o indeo3.o
 endif
 
 # currently using liba52 for ac3 decoding
@@ -31,7 +45,25 @@ OBJS+= 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/imdct.o  liba52/parse.o liba52/crc.o liba52/resample.o
+endif
+endif
+
+ifeq ($(CONFIG_FAAD),yes)
+OBJS+= faad.o
+ifeq ($(CONFIG_FAADBIN),yes)
+# no libs needed
+else
+EXTRALIBS += -lfaad
+endif
+endif
+
+ifeq ($(CONFIG_PP),yes)
+ifeq ($(SHARED_PP),yes)
+EXTRALIBS += -lpostproc
+else
+# LIBS += libpostproc/libpostproc.a ... should be fixed
+OBJS += libpostproc/postprocess.o
 endif
 endif
 
@@ -63,7 +95,7 @@ endif
 
 # armv4l specific stuff
 ifeq ($(TARGET_ARCH_ARMV4L),yes)
-ASM_OBJS += armv4l/jrevdct_arm.o
+ASM_OBJS += armv4l/jrevdct_arm.o armv4l/simple_idct_arm.o
 OBJS += armv4l/dsputil_arm.o armv4l/mpegvideo_arm.o
 endif
 
@@ -100,6 +132,11 @@ OBJS += ppc/dsputil_altivec.o ppc/mpegvideo_altivec.o ppc/idct_altivec.o \
         ppc/fft_altivec.o ppc/gmc_altivec.o
 endif
 
+ifeq ($(TARGET_ARCH_SH4),yes)
+OBJS+= sh4/idct_sh4.o sh4/dsputil_sh4.o sh4/dsputil_align.o
+endif
+
+
 SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)
 OBJS := $(OBJS) $(ASM_OBJS)
 
@@ -111,20 +148,24 @@ TESTS= imgresample-test dct-test motion-test fft-test
 
 all: $(LIB) $(SLIB)
 
+amrlibs:
+	$(MAKE) -C amr spclib fipoplib
+
 tests: apiexample cpuid_test $(TESTS)
 
-$(LIB): $(OBJS)
+$(LIB): $(OBJS) $(AMRLIBS)
 	rm -f $@
-	$(AR) rc $@ $(OBJS)
-ifneq ($(CONFIG_OS2),yes)
+	$(AR) rc $@ $(OBJS) $(AMREXTRALIBS)
 	$(RANLIB) $@
-endif
 
 $(SLIB): $(OBJS)
-	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS)
+	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
 
 dsputil.o: dsputil.c dsputil.h
 
+libpostproc/libpostproc.a:
+	$(MAKE) -C libpostproc
+
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $< 
 
@@ -147,19 +188,27 @@ depend: $(SRCS)
 
 dep:	depend
 
-clean: 
+clean: $(CLEANAMR)
 	rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *.so i386/*.o i386/*~ \
 	   armv4l/*.o armv4l/*~ \
 	   mlib/*.o mlib/*~ \
 	   alpha/*.o alpha/*~ \
 	   ppc/*.o ppc/*~ \
 	   ps2/*.o ps2/*~ \
+	   sh4/*.o sh4/*~ \
 	   liba52/*.o liba52/*~ \
 	   apiexample $(TESTS)
+	$(MAKE) -C libpostproc clean
 
 distclean: clean
 	rm -f Makefile.bak .depend
 
+cleanamr:
+	$(MAKE) -C amr clean
+
+cleanamrfloat:
+	rm -f amr_float/*.o
+
 # api example program
 apiexample: apiexample.c $(LIB)
 	$(CC) $(CFLAGS) -o $@ $< $(LIB) $(EXTRALIBS) -lm