# HG changeset patch # User mru # Date 1169413570 0 # Node ID 682b2e1ff76ace89a849bc6e30fd999c4846029b # Parent e114a5769718bfd31951401db6d7938e3f964e88 remove no longer needed ifeq tests diff -r e114a5769718 -r 682b2e1ff76a Makefile --- a/Makefile Sun Jan 21 21:04:01 2007 +0000 +++ b/Makefile Sun Jan 21 21:06:10 2007 +0000 @@ -77,6 +77,8 @@ 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_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 \