Make all tables static const.

[ffmpeg] / libavcodec / Makefile

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 3ac7bd25fb5487614af452afa08772a3e48dc109..60a796657775a18f835e60b9d372e418c9319aef 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -17,8 +17,8 @@ OBJS= bitstream.o utils.o mem.o allcodecs.o \
       ratecontrol.o adpcm.o eval.o error_resilience.o \
       fft.o mdct.o raw.o golomb.o cabac.o\
       dpcm.o adx.o faandct.o parser.o g726.o \
-      vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o dvdsub.o dvbsub.o dvbsubdec.o\
-      opt.o qdm2.o truemotion2.o
+      vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o \
+      opt.o
 
 ifeq ($(CONFIG_AASC_DECODER),yes)
     OBJS+= aasc.o
@@ -32,12 +32,27 @@ 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
@@ -98,6 +113,9 @@ 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
@@ -140,6 +158,12 @@ 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_TSCC_DECODER),yes)
     OBJS+= tscc.o
 endif
@@ -179,8 +203,10 @@ endif
 ifeq ($(CONFIG_XL_DECODER),yes)
     OBJS+= xl.o
 endif
-      
-      
+ifeq ($(CONFIG_BMP_DECODER),yes)
+       OBJS+= bmp.o
+endif
+
 AMROBJS=
 ifeq ($(AMR_NB),yes)
 ifeq ($(AMR_NB_FIXED),yes)
@@ -240,6 +266,7 @@ EXTRALIBS += -L../libavutil -lavutil$(BUILDSUF)
 # currently using libdts for dts decoding
 ifeq ($(CONFIG_DTS),yes)
 OBJS+= dtsdec.o
+CFLAGS += $(DTS_INC)
 endif
 
 ifeq ($(CONFIG_FAAD),yes)
@@ -356,7 +383,7 @@ endif
 ifeq ($(TARGET_ARCH_SPARC),yes)
 OBJS+=sparc/dsputil_vis.o
 sparc/%.o: sparc/%.c
-       $(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $< 
+       $(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $<
 endif
 ifeq ($(TARGET_ARCH_SPARC64),yes)
 CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
@@ -406,7 +433,7 @@ libpostproc/libpostproc.a:
        $(MAKE) -C libpostproc
 
 %.o: %.c
-       $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< 
+       $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
 
 %.o: %.S
        $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
@@ -464,6 +491,7 @@ fft-test: fft-test.o $(LIB)
        $(CC) -o $@ $^ $(LIBAVUTIL) -lm
 
 ifeq ($(BUILD_SHARED),yes)
+LIBVERSION=$(LAVCMAJOR)
 install: all install-headers
 ifeq ($(CONFIG_WIN32),yes)
        install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
@@ -487,8 +515,8 @@ install-headers:
        mkdir -p "$(prefix)/include/ffmpeg"
        install -m 644 $(SRC_PATH)/libavcodec/avcodec.h \
                 "$(prefix)/include/ffmpeg"
-       install -d $(libdir)/pkgconfig
-       install -m 644 ../libavcodec.pc $(libdir)/pkgconfig
+       install -d "$(libdir)/pkgconfig"
+       install -m 644 ../libavcodec.pc "$(libdir)/pkgconfig"
 
 #
 # include dependency files if they exist