Move #ifdefs around complete files into the build system.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18774 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 100 insertions, 48 deletions

diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index c6b5ce7218..d773e680bd 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -10,10 +10,15 @@ LIBS+=$(LIBNAME2)
 endif
 
 AUDIO_SRCS_LIB=ad_hwac3.c \
-               ad_liba52.c \
-               ad_mp3lib.c \
                ad_hwmpa.c \
 
+ifeq ($(LIBA52),yes)
+AUDIO_SRCS_LIB+=ad_liba52.c
+endif
+ifeq ($(MP3LIB),yes)
+AUDIO_SRCS_LIB+=ad_mp3lib.c
+endif
+
 AUDIO_SRCS_NAT=ad_alaw.c \
                ad_dk3adpcm.c \
                ad_dvdpcm.c \
@@ -22,35 +27,47 @@ AUDIO_SRCS_NAT=ad_alaw.c \
                ad_msgsm.c \
                ad_pcm.c \
 
-AUDIO_SRCS_OPT=ad_acm.c \
-               ad_faad.c \
-               ad_libdv.c \
-               ad_libmad.c \
-               ad_libvorbis.c \
-               ad_qtaudio.c \
-               ad_realaud.c \
-               ad_twin.c \
+AUDIO_SRCS=dec_audio.c \
+           ad.c \
+           $(AUDIO_SRCS_LIB) \
+           $(AUDIO_SRCS_NAT) \
 
 ifeq ($(CONFIG_LIBAVCODEC),yes)
-AUDIO_SRCS_OPT+=ad_ffmpeg.c
+AUDIO_SRCS+=ad_ffmpeg.c
 endif
 ifeq ($(CONFIG_LIBAVCODEC_SO),yes)
-AUDIO_SRCS_OPT+=ad_ffmpeg.c
+AUDIO_SRCS+=ad_ffmpeg.c
 endif
 ifeq ($(WIN32DLL),yes)
-AUDIO_SRCS_OPT+=ad_dshow.c ad_dmo.c
+AUDIO_SRCS+=ad_acm.c ad_dmo.c ad_dshow.c ad_twin.c
+endif
+ifeq ($(QTX_CODECS),yes)
+AUDIO_SRCS+=ad_qtaudio.c
+endif
+ifeq ($(REAL_CODECS),yes)
+AUDIO_SRCS+=ad_realaud.c
+endif
+ifeq ($(FAAD),yes)
+AUDIO_SRCS += ad_faad.c
+endif
+ifeq ($(LIBDV),yes)
+AUDIO_SRCS+=ad_libdv.c
+endif
+ifeq ($(LIBMAD),yes)
+AUDIO_SRCS+=ad_libmad.c
+endif
+ifeq ($(LIBVORBIS),yes)
+AUDIO_SRCS+=ad_libvorbis.c
 endif
 
-AUDIO_SRCS=dec_audio.c \
-           ad.c \
-           $(AUDIO_SRCS_LIB) \
-           $(AUDIO_SRCS_NAT) \
-           $(AUDIO_SRCS_OPT) \
 
-VIDEO_SRCS_LIB=vd_libmpeg2.c \
-               vd_lzo.c \
+VIDEO_SRCS_LIB=vd_lzo.c \
                vd_nuv.c \
 
+ifeq ($(LIBMPEG2),yes)
+VIDEO_SRCS_LIB+=vd_libmpeg2.c
+endif
+
 VIDEO_SRCS_NAT=vd_hmblck.c \
                vd_mpegpes.c \
                vd_mtga.c \
@@ -58,34 +75,52 @@ VIDEO_SRCS_NAT=vd_hmblck.c \
                vd_raw.c \
                vd_sgi.c \
 
-VIDEO_SRCS_OPT=vd_divx4.c \
-               vd_libdv.c \
-               vd_odivx.c \
-               vd_qtvideo.c \
-               vd_realvid.c \
-               vd_theora.c \
-               vd_vfw.c \
-               vd_vfwex.c \
-               vd_xanim.c \
-               vd_xvid4.c \
-               vd_xvid.c \
-               vd_zrmjpeg.c \
+VIDEO_SRCS=dec_video.c \
+           vd.c \
+           $(VIDEO_SRCS_NAT) \
+           $(VIDEO_SRCS_LIB) \
 
 ifeq ($(CONFIG_LIBAVCODEC),yes)
-VIDEO_SRCS_OPT+=vd_ffmpeg.c
+VIDEO_SRCS+=vd_ffmpeg.c
 endif
 ifeq ($(CONFIG_LIBAVCODEC_SO),yes)
-VIDEO_SRCS_OPT+=vd_ffmpeg.c
+VIDEO_SRCS+=vd_ffmpeg.c
 endif
 ifeq ($(WIN32DLL),yes)
-VIDEO_SRCS_OPT+=vd_dmo.c vd_dshow.c
+VIDEO_SRCS+=vd_dmo.c vd_dshow.c vd_vfw.c vd_vfwex.c
+endif
+ifeq ($(QTX_CODECS),yes)
+VIDEO_SRCS+=vd_qtvideo.c
+endif
+ifeq ($(REAL_CODECS),yes)
+VIDEO_SRCS+=vd_realvid.c
+endif
+ifeq ($(XANIM_CODECS),yes)
+VIDEO_SRCS+=vd_xanim.c
+endif
+ifeq ($(LIBDV),yes)
+VIDEO_SRCS+=vd_libdv.c
+endif
+ifeq ($(LIBTHEORA),yes)
+VIDEO_SRCS+=vd_theora.c
+endif
+ifeq ($(DIVX),yes)
+VIDEO_SRCS+=vd_odivx.c
+  ifneq ($(OPENDIVX),yes)
+  VIDEO_SRCS+=vd_divx4.c
+  endif
+endif
+ifeq ($(XVID4),yes)
+VIDEO_SRCS+=vd_xvid4.c
+else
+  ifeq ($(XVID),yes)
+  VIDEO_SRCS+=vd_xvid.c
+  endif
+endif
+ifeq ($(ZORAN),yes)
+VIDEO_SRCS+=vd_zrmjpeg.c
 endif
 
-VIDEO_SRCS=dec_video.c \
-           vd.c \
-           $(VIDEO_SRCS_NAT) \
-           $(VIDEO_SRCS_LIB) \
-           $(VIDEO_SRCS_OPT) \
 
 VFILTER_SRCS=vf.c \
              pullup.c \
@@ -150,7 +185,6 @@ VFILTER_SRCS=vf.c \
              vf_yuvcsp.c \
              vf_yuy2.c \
              vf_yvu9.c \
-             vf_screenshot.c \
              vf_yadif.c \
 
 VFILTER_LAVC_SRCS += vf_lavc.c \
@@ -177,17 +211,16 @@ ifeq ($(CONFIG_LIBAVCODEC_SO),yes)
 VFILTER_SRCS += $(VFILTER_LAVC_SRCS)
 endif
 
+ifeq ($(PNG),yes)
+VFILTER_SRCS += vf_screenshot.c
+endif
+
+
 ENCODER_SRCS=ae.c \
              ae_pcm.c \
              ve.c \
-             ve_divx4.c \
-             ve_libdv.c \
              ve_nuv.c \
-             ve_qtvideo.c \
              ve_raw.c \
-             ve_vfw.c \
-             ve_xvid4.c \
-             ve_xvid.c \
 
 ifeq ($(CONFIG_LIBAVCODEC),yes)
 ENCODER_SRCS+=ve_lavc.c
@@ -195,11 +228,30 @@ endif
 ifeq ($(CONFIG_LIBAVCODEC_SO),yes)
 ENCODER_SRCS+=ve_lavc.c
 endif
-
+ifeq ($(WIN32DLL),yes)
+ENCODER_SRCS+=ve_vfw.c
+endif
+ifeq ($(QTX_CODECS),yes)
+ENCODER_SRCS+=ve_qtvideo.c
+endif
+ifeq ($(LIBDV),yes)
+ENCODER_SRCS+=ve_libdv.c
+endif
+ifeq ($(XVID4),yes)
+ENCODER_SRCS+=ve_xvid4.c
+else
+  ifeq ($(XVID),yes)
+  ENCODER_SRCS+=ve_xvid.c
+  endif
+endif
+ifeq ($(DIVX4ENCORE),yes)
+ENCODER_SRCS+=ve_divx4.c
+endif
 ifeq ($(X264),yes)
 ENCODER_SRCS+=ve_x264.c
 endif
 
+
 NATIVE_SRCS=native/minilzo.c \
             native/nuppelvideo.c \
             native/RTjpegN.c \