Index: libavcodec/Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
retrieving revision 1.211
diff -u -r1.211 Makefile
--- libavcodec/Makefile 14 Nov 2005 22:17:29 -0000      1.211
+++ libavcodec/Makefile 20 Nov 2005 18:01:27 -0000
@@ -18,7 +18,7 @@
       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 dvdsubenc.o opt.o
+      opt.o

 ifeq ($(CONFIG_AASC_DECODER),yes)
     OBJS+= aasc.o
@@ -38,6 +38,19 @@
 ifeq ($(CONFIG_CYUV_DECODER),yes)
     OBJS+= cyuv.o
 endif
+ifeq ($(CONFIG_DVBSUB_DECODER),yes)
+   OBJS+= dvbsub.o
+endif
+dvdsub.o dvbsub.o dvbsubdec.o dvdsubenc.o
+ifeq ($(CONFIG_DVDSUB_DECODER),yes)
+   OBJS+= dvdsub.o
+endif
+ifeq ($(CONFIG_DVBSUB_DECODER)$(CONFIG_DVBSUB_ENCODER),)
+   OBJS+= dvbsubdec.o
+endif
+ifeq ($(CONFIG_DVDSUB_DECODER)$(CONFIG_DVDSUB_ENCODER),)
+   OBJS+= dvdsubenc.o
+endif
 ifneq ($(CONFIG_DVVIDEO_DECODER)$(CONFIG_DVVIDEO_ENCODER),)
     OBJS+= dv.o
 endif