diff options
| -rw-r--r-- | input/Makefile | 8 | ||||
| -rw-r--r-- | libaf/Makefile | 15 | ||||
| -rw-r--r-- | libmenu/Makefile | 4 | ||||
| -rw-r--r-- | libmpeg2/Makefile | 21 | ||||
| -rw-r--r-- | mp3lib/Makefile | 16 | ||||
| -rw-r--r-- | osdep/Makefile | 7 | ||||
| -rw-r--r-- | stream/Makefile | 147 |
7 files changed, 71 insertions, 147 deletions
diff --git a/input/Makefile b/input/Makefile index 0664ae9650..1ecf28e8bb 100644 --- a/input/Makefile +++ b/input/Makefile @@ -4,11 +4,7 @@ include ../config.mak LIBNAME = libinput.a SRCS=input.c -ifeq ($(JOYSTICK),yes) -SRCS += joystick.c -endif -ifeq ($(LIRC),yes) -SRCS += lirc.c -endif +SRCS-$(JOYSTICK) += joystick.c +SRCS-$(LIRC) += lirc.c include ../mpcommon.mak diff --git a/libaf/Makefile b/libaf/Makefile index 9957a8afbf..2bd0696e32 100644 --- a/libaf/Makefile +++ b/libaf/Makefile @@ -29,16 +29,11 @@ SRCS=af.c \ window.c \ $(AF_SRCS) \ -ifeq ($(CONFIG_LIBAVUTIL),yes) -LIBAV_INC += -I../libavutil -endif -ifeq ($(CONFIG_LIBAVCODEC),yes) -LIBAV_INC += -I../libavcodec -SRCS+=af_lavcresample.c -endif -ifeq ($(CONFIG_LIBAVCODEC_SO),yes) -SRCS+=af_lavcresample.c -endif +SRCS-$(CONFIG_LIBAVCODEC) += af_lavcresample.c +SRCS-$(CONFIG_LIBAVCODEC_SO) += af_lavcresample.c + +LIBAV_INC-$(CONFIG_LIBAVUTIL) += -I../libavutil +LIBAV_INC-$(CONFIG_LIBAVCODEC) += -I../libavcodec CFLAGS = -I.. $(LIBAV_INC) -D_GNU_SOURCE diff --git a/libmenu/Makefile b/libmenu/Makefile index 364f7f7949..5166c478fa 100644 --- a/libmenu/Makefile +++ b/libmenu/Makefile @@ -13,8 +13,6 @@ SRCS= menu.c \ menu_console.c \ menu_param.c \ -ifeq ($(DVBIN),yes) -SRCS += menu_dvbin.c -endif +SRCS-$(DVBIN) += menu_dvbin.c include ../mpcommon.mak diff --git a/libmpeg2/Makefile b/libmpeg2/Makefile index 40bc6c635b..50ed64062b 100644 --- a/libmpeg2/Makefile +++ b/libmpeg2/Makefile @@ -12,22 +12,11 @@ SRCS = alloc.c \ motion_comp.c \ slice.c \ -CFLAGS = -I../libvo -DMPG12PLAY - -ifeq ($(TARGET_MMX),yes) -SRCS += idct_mmx.c motion_comp_mmx.c -endif - -ifeq ($(TARGET_ALTIVEC),yes) -SRCS += motion_comp_altivec.c idct_altivec.c -endif +SRCS-$(TARGET_MMX) += idct_mmx.c motion_comp_mmx.c +SRCS-$(TARGET_ALTIVEC) += motion_comp_altivec.c idct_altivec.c +SRCS-$(TARGET_VIS) += motion_comp_vis.c +SRCS-$(TARGET_ARCH_ALPHA) += idct_alpha.c motion_comp_alpha.c -ifeq ($(TARGET_VIS),yes) -SRCS += motion_comp_vis.c -endif - -ifeq ($(TARGET_ARCH_ALPHA),yes) -SRCS += idct_alpha.c motion_comp_alpha.c -endif +CFLAGS = -I../libvo -DMPG12PLAY include ../mpcommon.mak diff --git a/mp3lib/Makefile b/mp3lib/Makefile index c6753360d7..93ec70881c 100644 --- a/mp3lib/Makefile +++ b/mp3lib/Makefile @@ -10,18 +10,10 @@ endif SRCS = sr1.c ifeq ($(TARGET_ARCH_X86_32),yes) SRCS += decode_i586.c -ifeq ($(TARGET_MMX),yes) -SRCS += decode_MMX.c dct64_MMX.c tabinit_MMX.c -endif -ifeq ($(TARGET_3DNOW),yes) -SRCS += dct36_3dnow.c dct64_3dnow.c -endif -ifeq ($(TARGET_3DNOWEX),yes) -SRCS += dct36_k7.c dct64_k7.c -endif -ifeq ($(TARGET_SSE),yes) -SRCS += dct64_sse.c -endif +SRCS-$(TARGET_MMX) += decode_MMX.c dct64_MMX.c tabinit_MMX.c +SRCS-$(TARGET_3DNOW) += dct36_3dnow.c dct64_3dnow.c +SRCS-$(TARGET_3DNOWEX) += dct36_k7.c dct64_k7.c +SRCS-$(TARGET_SSE) += dct64_sse.c endif ifeq ($(TARGET_ALTIVEC),yes) SRCS += dct64_altivec.c diff --git a/osdep/Makefile b/osdep/Makefile index 8153fa843d..005bf0033e 100644 --- a/osdep/Makefile +++ b/osdep/Makefile @@ -14,13 +14,12 @@ SRCS= shmem.c \ setenv.c \ mmap_anon.c \ +SRCS-$(MACOSX_FINDER_SUPPORT) += macosx_finder_args.c +SRCS-$(TARGET_WIN32) += mplayer-rc.c + getch = getch2.c timer = timer-lx.c -ifeq ($(MACOSX_FINDER_SUPPORT),yes) -SRCS += macosx_finder_args.c -endif ifeq ($(TARGET_WIN32),yes) -SRCS += mplayer-rc.c timer = timer-win2.c endif ifeq ($(TARGET_OS),Darwin) diff --git a/stream/Makefile b/stream/Makefile index be3f6a4361..b6a080ea37 100644 --- a/stream/Makefile +++ b/stream/Makefile @@ -11,107 +11,62 @@ SRCS += open.c \ stream_null.c \ url.c \ -ifeq ($(STREAM_CACHE),yes) -SRCS += cache2.c -endif +SRCS-$(CDDA) += stream_cdda.c cdinfo.c +SRCS-$(DVBIN) += dvb_tune.c stream_dvb.c +SRCS-$(DVDNAV) += stream_dvdnav.c +SRCS-$(DVDREAD) += stream_dvd.c +SRCS-$(FTP) += stream_ftp.c +SRCS-$(LIBSMBCLIENT) += stream_smb.c +SRCS-$(MPLAYER_NETWORK) += stream_netstream.c \ + asf_mmst_streaming.c \ + asf_streaming.c \ + cookies.c \ + http.c \ + network.c \ + pnm.c \ + rtp.c \ + udp.c \ + tcp.c \ + stream_rtp.c \ + stream_rtsp.c \ + stream_udp.c \ + freesdp/common.c \ + freesdp/errorlist.c \ + freesdp/parser.c \ + librtsp/rtsp.c \ + librtsp/rtsp_rtp.c \ + librtsp/rtsp_session.c \ + realrtsp/asmrp.c \ + realrtsp/real.c \ + realrtsp/rmff.c \ + realrtsp/sdpplin.c \ + realrtsp/xbuffer.c \ + +SRCS-$(PVR) += stream_pvr.c +SRCS-$(RADIO) += stream_radio.c +SRCS-$(RADIO_CAPTURE) += audio_in.c +SRCS-$(STREAM_CACHE) += cache2.c +SRCS-$(STREAMING_LIVE555) += stream_livedotcom.c +SRCS-$(TV) += stream_tv.c tv.c frequencies.c tvi_dummy.c +SRCS-$(TV_BSDBT848) += tvi_bsdbt848.c +SRCS-$(TV_V4L1) += tvi_v4l.c audio_in.c +SRCS-$(TV_V4L2) += tvi_v4l2.c audio_in.c +SRCS-$(VCD) += stream_vcd.c +SRCS-$(VSTREAM) += stream_vstream.c + +#FIXME: These should have variables assigned in configure. ifeq ($(CDDA),yes) -SRCS += stream_cdda.c cdinfo.c - ifeq ($(MPLAYER_NETWORK),yes) - SRCS += stream_cddb.c - endif -endif -ifeq ($(DVDREAD),yes) -SRCS += stream_dvd.c -endif -ifeq ($(DVDNAV),yes) -SRCS += stream_dvdnav.c -endif -ifeq ($(VCD),yes) -SRCS += stream_vcd.c -endif -ifeq ($(FTP),yes) -SRCS += stream_ftp.c -endif -ifeq ($(LIBSMBCLIENT),yes) -SRCS += stream_smb.c -endif -ifeq ($(MPLAYER_NETWORK),yes) -SRCS += stream_netstream.c -endif -ifeq ($(STREAMING_LIVE555),yes) -SRCS += stream_livedotcom.c -endif -ifeq ($(VSTREAM),yes) -SRCS += stream_vstream.c -endif -ifeq ($(TV),yes) -SRCS += stream_tv.c tv.c frequencies.c tvi_dummy.c -endif -ifeq ($(TV_BSDBT848),yes) -SRCS += tvi_bsdbt848.c -endif -ifeq ($(TV_V4L2),yes) -SRCS += tvi_v4l2.c audio_in.c -endif -ifeq ($(PVR),yes) -SRCS += stream_pvr.c -endif -ifeq ($(TV_V4L1),yes) -SRCS += tvi_v4l.c audio_in.c +SRCS-$(MPLAYER_NETWORK) += stream_cddb.c endif ifeq ($(TV_V4L),yes) - ifeq ($(ALSA1X),yes) - SRCS += ai_alsa1x.c - endif - ifeq ($(ALSA9),yes) - SRCS += ai_alsa.c - endif - ifeq ($(OSS),yes) - SRCS += ai_oss.c - endif -endif -ifeq ($(RADIO),yes) -SRCS += stream_radio.c +SRCS-$(ALSA1X) += ai_alsa1x.c +SRCS-$(ALSA9) += ai_alsa.c +SRCS-$(OSS) += ai_oss.c endif ifeq ($(RADIO_CAPTURE),yes) -SRCS += audio_in.c - ifeq ($(ALSA1X),yes) - SRCS += ai_alsa1x.c - endif - ifeq ($(ALSA9),yes) - SRCS += ai_alsa.c - endif - ifeq ($(OSS),yes) - SRCS += ai_oss.c - endif -endif -ifeq ($(MPLAYER_NETWORK),yes) -SRCS += asf_mmst_streaming.c \ - asf_streaming.c \ - cookies.c \ - http.c \ - network.c \ - pnm.c \ - rtp.c \ - udp.c \ - tcp.c \ - stream_rtsp.c \ - stream_rtp.c \ - stream_udp.c \ - freesdp/common.c \ - freesdp/errorlist.c \ - freesdp/parser.c \ - librtsp/rtsp.c \ - librtsp/rtsp_rtp.c \ - librtsp/rtsp_session.c \ - realrtsp/asmrp.c \ - realrtsp/real.c \ - realrtsp/rmff.c \ - realrtsp/sdpplin.c \ - realrtsp/xbuffer.c \ -endif -ifeq ($(DVBIN),yes) -SRCS += dvb_tune.c stream_dvb.c +SRCS-$(ALSA1X) += ai_alsa1x.c +SRCS-$(ALSA9) += ai_alsa.c +SRCS-$(OSS) += ai_oss.c endif CFLAGS = -I../loader |