diff options
| author | Måns Rullgård <mans@mansr.com> | 2007-01-21 21:06:10 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2007-01-21 21:06:10 +0000 |
| commit | 90d912afd9493e41e49fa5f4b4180433027e500c (patch) | |
| tree | d95b5f3544b4677989b413686b2eb10b55ee2b72 | |
| parent | eba70fa4e2c522744e9918a2b5d77e299f480ddd (diff) | |
| download | ffmpeg-90d912afd9493e41e49fa5f4b4180433027e500c.tar.gz | |
remove no longer needed ifeq tests
Originally committed as revision 7618 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/Makefile | 8 | ||||
| -rw-r--r-- | libavformat/Makefile | 12 |
2 files changed, 2 insertions, 18 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index fb01a81375..56cfdfa284 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -77,6 +77,8 @@ OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.o OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.o OBJS-$(CONFIG_FLAC_DECODER) += flac.o OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o +OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.o +OBJS-$(CONFIG_FLASHSV_ENCODER) += flashsvenc.o OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.o OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o @@ -242,12 +244,6 @@ OBJS-$(CONFIG_ADPCM_XA_ENCODER) += adpcm.o OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.o OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcm.o -# external dependencies -ifeq ($(CONFIG_ZLIB),yes) -OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.o -OBJS-$(CONFIG_FLASHSV_ENCODER) += flashsvenc.o -endif - # external codec libraries OBJS-$(CONFIG_LIBA52) += a52dec.o OBJS-$(CONFIG_LIBA52)$(CONFIG_LIBA52BIN) += liba52/bit_allocate.o \ diff --git a/libavformat/Makefile b/libavformat/Makefile index 9c6dfd9134..a7e8f9e29a 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -129,29 +129,21 @@ OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o OBJS+= framehook.o -ifeq ($(CONFIG_X11GRAB),yes) OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER) += x11grab.o -endif ifeq ($(CONFIG_VIDEO4LINUX),yes) OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab.o endif -ifeq ($(CONFIG_VIDEO4LINUX2),yes) OBJS-$(CONFIG_V4L2_DEMUXER) += v4l2.o -endif ifeq ($(CONFIG_BKTR),yes) OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab_bktr.o endif -ifeq ($(CONFIG_DV1394),yes) OBJS-$(CONFIG_DV1394_DEMUXER) += dv1394.o -endif -ifeq ($(CONFIG_DC1394),yes) OBJS-$(CONFIG_DC1394_DEMUXER) += dc1394.o -endif ifeq ($(CONFIG_AUDIO_OSS),yes) OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o @@ -183,13 +175,9 @@ OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o riff.o #OBJS-$(CONFIG_NUT_MUXER) += nutenc.o riff.o endif -ifeq ($(CONFIG_LIBOGG),yes) OBJS-$(CONFIG_OGG_MUXER) += ogg.o -endif -ifeq ($(CONFIG_GPL),yes) OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o -endif OBJS += $(OBJS-yes) |