split intra / inter dequantization

[ffmpeg] / libavcodec / Makefile

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 1d90426d76023cbd6ce290eb1f694618c02edaa0..f3b79c4176bb730bac817ab5d88e4c860484a99e 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1,14 +1,13 @@
 #
 # libavcodec Makefile
-# (c) 2000, 2001, 2002 Fabrice Bellard
+# (c) 2000-2003 Fabrice Bellard
 #
 include ../config.mak
 
 VPATH=$(SRC_PATH)/libavcodec
 
 # NOTE: -I.. is needed to include config.h
-CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-LDFLAGS= -g
+CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
 
 OBJS= common.o utils.o mem.o allcodecs.o \
       mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
@@ -17,7 +16,10 @@ OBJS= common.o utils.o mem.o allcodecs.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 raw.o h264.o golomb.o \
-      vp3.o asv1.o 4xm.o cabac.o ffv1.o ra144.o ra288.o vcr1.o cljr.o
+      vp3.o asv1.o 4xm.o cabac.o ffv1.o ra144.o ra288.o vcr1.o cljr.o \
+      roqvideo.o dpcm.o interplayvideo.o xan.o rpza.o cinepak.o msrle.o \
+      msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o \
+      smc.o parser.o flicvideo.o truemotion1.o
 
 ifeq ($(AMR_NB),yes)
 ifeq ($(AMR_NB_FIXED),yes)
@@ -31,6 +33,15 @@ CLEANAMR=cleanamrfloat
 endif
 endif
 
+ifeq ($(AMR_WB),yes)
+OBJS+= amr.o 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
+CLEANAMRWB=cleanamrwbfloat
 ASM_OBJS=
 
 # codecs which are patented in some non free countries like the us
@@ -62,6 +73,11 @@ EXTRALIBS += -lfaad
 endif
 endif
 
+ifeq ($(CONFIG_FAAC),yes)
+OBJS+= faac.o
+EXTRALIBS += -lfaac
+endif
+
 ifeq ($(CONFIG_PP),yes)
 ifeq ($(SHARED_PP),yes)
 EXTRALIBS += -lpostproc
@@ -128,7 +144,7 @@ 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/fft_altivec.o ppc/gmc_altivec.o ppc/fdct_altivec.o
 endif
 
 ifeq ($(TARGET_ARCH_SH4),yes)
@@ -158,7 +174,12 @@ $(LIB): $(OBJS) $(AMRLIBS)
        $(RANLIB) $@
 
 $(SLIB): $(OBJS)
+ifeq ($(CONFIG_WIN32),yes)
+       $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
+       -lib /machine:i386 /def:$(@:.dll=.def)
+else
        $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
+endif
 
 dsputil.o: dsputil.c dsputil.h
 
@@ -171,17 +192,6 @@ libpostproc/libpostproc.a:
 %.o: %.S
        $(CC) $(CFLAGS) -c -o $@ $<
 
-# motion_est_alpha uses the MVI extension, which is not available with
-# -mcpu=ev4 (default) or ev5/ev56. Thus, force -mcpu=pca56 in those
-# cases.
-ifeq ($(TARGET_ARCH_ALPHA),yes)
-alpha/motion_est_alpha.o: alpha/motion_est_alpha.c
-       cpu=`echo "$(CFLAGS)" | sed -n 's,.*-mcpu=\([a-zA-Z0-9]*\).*,\1,p'`; \
-       case x"$$cpu" in x|xev[45]*) newcpu=pca56;; *) newcpu=$$cpu;; esac; \
-       echo $(CC) $(CFLAGS) -mcpu=$$newcpu -c -o $@ $<;\
-       $(CC) $(CFLAGS) -mcpu=$$newcpu -c -o $@ $<
-endif
-
 depend: $(SRCS)
        $(CC) -MM $(CFLAGS) $^ 1>.depend
 
@@ -208,6 +218,9 @@ cleanamr:
 cleanamrfloat:
        rm -f amr_float/*.o
 
+cleanamrwbfloat:
+       $(MAKE) -C amrwb_float -f makefile.gcc clean
+
 # api example program
 apiexample: apiexample.c $(LIB)
        $(CC) $(CFLAGS) -o $@ $< $(LIB) $(EXTRALIBS) -lm
@@ -230,22 +243,29 @@ motion-test: motion_test.o $(LIB)
 fft-test: fft-test.o $(LIB)
        $(CC) -o $@ $^ -lm
 
-install: all
 ifeq ($(BUILD_SHARED),yes)
+install: all install-headers
+ifeq ($(CONFIG_WIN32),yes)
+       install -s -m 755 $(SLIB) "$(prefix)"
+else
        install -d $(prefix)/lib
        install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
        ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
        ldconfig || true
-       mkdir -p $(prefix)/include/ffmpeg
-       install -m 644 $(VPATH)/avcodec.h $(prefix)/include/ffmpeg/avcodec.h
-       install -m 644 $(VPATH)/common.h $(prefix)/include/ffmpeg/common.h
+endif
+else
+install:
 endif
 
-installlib: all
+installlib: all install-headers
        install -m 644 $(LIB) $(prefix)/lib
-       mkdir -p $(prefix)/include/ffmpeg
-       install -m 644 $(SRC_PATH)/libavcodec/avcodec.h $(SRC_PATH)/libavcodec/common.h \
-                $(prefix)/include/ffmpeg
+
+install-headers:
+       mkdir -p "$(prefix)/include/ffmpeg"
+       install -m 644 $(SRC_PATH)/libavcodec/avcodec.h \
+                      $(SRC_PATH)/libavcodec/common.h \
+                      $(SRC_PATH)/libavcodec/rational.h \
+                "$(prefix)/include/ffmpeg"
 
 #
 # include dependency files if they exist