From 20ef914470e48f0f5db356dcb30d449f6370dbcd Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 13:04:50 +0000 Subject: Merge libmpcodecs/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26514 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 163 insertions(+), 12 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 10ca79bedd..7a8ce893b7 100644 --- a/Makefile +++ b/Makefile @@ -59,6 +59,97 @@ SRCS_COMMON = asxparser.c \ libaf/format.c \ libaf/reorder_ch.c \ libaf/window.c \ + libmpcodecs/ad.c \ + libmpcodecs/ad_alaw.c \ + libmpcodecs/ad_dk3adpcm.c \ + libmpcodecs/ad_dvdpcm.c \ + libmpcodecs/ad_hwac3.c \ + libmpcodecs/ad_hwmpa.c \ + libmpcodecs/ad_imaadpcm.c \ + libmpcodecs/ad_msadpcm.c \ + libmpcodecs/ad_msgsm.c \ + libmpcodecs/ad_pcm.c \ + libmpcodecs/dec_audio.c \ + libmpcodecs/dec_video.c \ + libmpcodecs/img_format.c \ + libmpcodecs/mp_image.c \ + libmpcodecs/native/nuppelvideo.c \ + libmpcodecs/native/rtjpegn.c \ + libmpcodecs/native/xa_gsm.c \ + libmpcodecs/pullup.c \ + libmpcodecs/vd.c \ + libmpcodecs/vd_hmblck.c \ + libmpcodecs/vd_lzo.c \ + libmpcodecs/vd_mpegpes.c \ + libmpcodecs/vd_mtga.c \ + libmpcodecs/vd_null.c \ + libmpcodecs/vd_nuv.c \ + libmpcodecs/vd_raw.c \ + libmpcodecs/vd_sgi.c \ + libmpcodecs/vf.c \ + libmpcodecs/vf_1bpp.c \ + libmpcodecs/vf_2xsai.c \ + libmpcodecs/vf_blackframe.c \ + libmpcodecs/vf_boxblur.c \ + libmpcodecs/vf_crop.c \ + libmpcodecs/vf_cropdetect.c \ + libmpcodecs/vf_decimate.c \ + libmpcodecs/vf_delogo.c \ + libmpcodecs/vf_denoise3d.c \ + libmpcodecs/vf_detc.c \ + libmpcodecs/vf_dint.c \ + libmpcodecs/vf_divtc.c \ + libmpcodecs/vf_down3dright.c \ + libmpcodecs/vf_dsize.c \ + libmpcodecs/vf_dvbscale.c \ + libmpcodecs/vf_eq.c \ + libmpcodecs/vf_eq2.c \ + libmpcodecs/vf_expand.c \ + libmpcodecs/vf_field.c \ + libmpcodecs/vf_fil.c \ + libmpcodecs/vf_filmdint.c \ + libmpcodecs/vf_flip.c \ + libmpcodecs/vf_format.c \ + libmpcodecs/vf_framestep.c \ + libmpcodecs/vf_halfpack.c \ + libmpcodecs/vf_harddup.c \ + libmpcodecs/vf_hqdn3d.c \ + libmpcodecs/vf_hue.c \ + libmpcodecs/vf_il.c \ + libmpcodecs/vf_ilpack.c \ + libmpcodecs/vf_ivtc.c \ + libmpcodecs/vf_kerndeint.c \ + libmpcodecs/vf_mirror.c \ + libmpcodecs/vf_noformat.c \ + libmpcodecs/vf_noise.c \ + libmpcodecs/vf_ow.c \ + libmpcodecs/vf_palette.c \ + libmpcodecs/vf_perspective.c \ + libmpcodecs/vf_phase.c \ + libmpcodecs/vf_pp7.c \ + libmpcodecs/vf_pullup.c \ + libmpcodecs/vf_rectangle.c \ + libmpcodecs/vf_remove_logo.c \ + libmpcodecs/vf_rgb2bgr.c \ + libmpcodecs/vf_rgbtest.c \ + libmpcodecs/vf_rotate.c \ + libmpcodecs/vf_sab.c \ + libmpcodecs/vf_scale.c \ + libmpcodecs/vf_smartblur.c \ + libmpcodecs/vf_softpulldown.c \ + libmpcodecs/vf_softskip.c \ + libmpcodecs/vf_swapuv.c \ + libmpcodecs/vf_telecine.c \ + libmpcodecs/vf_test.c \ + libmpcodecs/vf_tfields.c \ + libmpcodecs/vf_tile.c \ + libmpcodecs/vf_tinterlace.c \ + libmpcodecs/vf_unsharp.c \ + libmpcodecs/vf_vo.c \ + libmpcodecs/vf_yadif.c \ + libmpcodecs/vf_yuvcsp.c \ + libmpcodecs/vf_yuy2.c \ + libmpcodecs/vf_yvu9.c \ libvo/aclib.c \ libvo/osd.c \ libvo/sub.c \ @@ -66,10 +157,14 @@ SRCS_COMMON = asxparser.c \ osdep/$(TIMER) \ SRCS_COMMON-$(BITMAP_FONT) += libvo/font_load.c +SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c +SRCS_COMMON-$(HAVE_POSIX_SELECT) += libmpcodecs/vf_bmovl.c SRCS_COMMON-$(HAVE_SYS_MMAN_H) += osdep/mmap_anon.c SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c +SRCS_COMMON-$(JPEG) += libmpcodecs/vd_ijpg.c SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c +SRCS_COMMON-$(LIBA52) += libmpcodecs/ad_liba52.c SRCS_COMMON-$(LIBASS) += libass/ass.c \ libass/ass_bitmap.c \ libass/ass_cache.c \ @@ -79,10 +174,35 @@ SRCS_COMMON-$(LIBASS) += libass/ass.c \ libass/ass_mp.c \ libass/ass_render.c \ libass/ass_utils.c \ - -SRCS_COMMON-$(LIBAVCODEC) += libaf/af_lavcresample.c -SRCS_COMMON-$(LIBAVCODEC_A) += libaf/af_lavcac3enc.c + libmpcodecs/vf_ass.c \ + +SRCS_COMMON-$(LIBAVCODEC) += libaf/af_lavcresample.c \ + libmpcodecs/ad_ffmpeg.c \ + libmpcodecs/vd_ffmpeg.c \ + libmpcodecs/vf_lavc.c \ + libmpcodecs/vf_lavcdeint.c \ + libmpcodecs/vf_screenshot.c \ + +# These filters use private headers and do not work with shared libavcodec. +SRCS_COMMON-$(LIBAVCODEC_A) += libaf/af_lavcac3enc.c \ + libmpcodecs/vf_fspp.c \ + libmpcodecs/vf_geq.c \ + libmpcodecs/vf_mcdeint.c \ + libmpcodecs/vf_qp.c \ + libmpcodecs/vf_spp.c \ + libmpcodecs/vf_uspp.c \ + +SRCS_COMMON-$(LIBDCA) += libmpcodecs/ad_libdca.c +SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ + libmpcodecs/vd_libdv.c +SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c +SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c +SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c +SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c +SRCS_COMMON-$(LIBVORBIS) += libmpcodecs/ad_libvorbis.c SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c +SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c +SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c SRCS_COMMON-$(NEED_GETTIMEOFDAY) += osdep/gettimeofday.c SRCS_COMMON-$(NEED_GLOB) += osdep/glob-win.c SRCS_COMMON-$(NEED_MMAP) += osdep/mmap-os2.c @@ -91,6 +211,12 @@ SRCS_COMMON-$(NEED_SHMEM) += osdep/shmem.c SRCS_COMMON-$(NEED_STRSEP) += osdep/strsep.c SRCS_COMMON-$(NEED_SWAB) += osdep/swab.c SRCS_COMMON-$(NEED_VSSCANF) += osdep/vsscanf.c +SRCS_COMMON-$(PNG) += libmpcodecs/vd_mpng.c +SRCS_COMMON-$(QTX_CODECS) += libmpcodecs/ad_qtaudio.c \ + libmpcodecs/vd_qtvideo.c +SRCS_COMMON-$(REAL_CODECS) += libmpcodecs/ad_realaud.c \ + libmpcodecs/vd_realvid.c +SRCS_COMMON-$(SPEEX) += libmpcodecs/ad_speex.c SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \ tremor/block.c \ tremor/codebook.c \ @@ -107,6 +233,19 @@ SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \ tremor/window.c \ SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c +SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \ + libmpcodecs/ad_dmo.c \ + libmpcodecs/ad_dshow.c \ + libmpcodecs/ad_twin.c \ + libmpcodecs/vd_dmo.c \ + libmpcodecs/vd_dshow.c \ + libmpcodecs/vd_vfw.c \ + libmpcodecs/vd_vfwex.c \ + +SRCS_COMMON-$(XANIM_CODECS) += libmpcodecs/vd_xanim.c +SRCS_COMMON-$(XVID4) += libmpcodecs/vd_xvid4.c +SRCS_COMMON-$(ZORAN) += libmpcodecs/vd_zrmjpeg.c \ + libmpcodecs/vf_zrmjpeg.c SRCS_MPLAYER = mplayer.c \ m_property.c \ @@ -191,9 +330,24 @@ SRCS_MENCODER = mencoder.c \ mp_msg-mencoder.c \ parser-mecmd.c \ xvid_vbr.c \ - -COMMON_LIBS = libmpcodecs/libmpcodecs.a \ - libmpdemux/libmpdemux.a \ + libmpcodecs/ae.c \ + libmpcodecs/ae_pcm.c \ + libmpcodecs/ve.c \ + libmpcodecs/ve_raw.c \ + +SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c +SRCS_MENCODER-$(LIBAVCODEC) += libmpcodecs/ae_lavc.c libmpcodecs/ve_lavc.c +SRCS_MENCODER-$(LIBDV) += libmpcodecs/ve_libdv.c +SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c +SRCS_MENCODER-$(MP3LAME) += libmpcodecs/ae_lame.c +SRCS_MENCODER-$(QTX_CODECS) += libmpcodecs/ve_qtvideo.c +SRCS_MENCODER-$(TOOLAME) += libmpcodecs/ae_toolame.c +SRCS_MENCODER-$(TWOLAME) += libmpcodecs/ae_twolame.c +SRCS_MENCODER-$(WIN32DLL) += libmpcodecs/ve_vfw.c +SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c +SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c + +COMMON_LIBS = libmpdemux/libmpdemux.a \ stream/stream.a \ libswscale/libswscale.a \ @@ -211,8 +365,7 @@ COMMON_LIBS-$(DVDCSS_INTERNAL) += libdvdcss/libdvdcss.a LIBS_MPLAYER-$(VIDIX) += vidix/vidix.a -LIBS_MENCODER = libmpcodecs/libmpencoders.a \ - libmpdemux/libmpmux.a \ +LIBS_MENCODER = libmpdemux/libmpmux.a \ ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) ALL_PRG-$(MENCODER) += mencoder$(EXESUF) @@ -237,7 +390,6 @@ PARTS = dvdread \ libavutil \ libdvdcss \ libfaad2 \ - libmpcodecs \ libmpdemux \ libmpeg2 \ libpostproc \ @@ -261,6 +413,8 @@ DIRS = gui \ libao2 \ libass \ libmenu \ + libmpcodecs \ + libmpcodecs/native \ libvo \ osdep \ tremor \ @@ -287,9 +441,6 @@ endef $(foreach part,$(PARTS),$(eval $(RECURSIVE_RULE))) -libmpcodecs/libmpencoders.a: - $(MAKE) -C libmpcodecs libmpencoders.a - libmpdemux/libmpmux.a: $(MAKE) -C libmpdemux libmpmux.a -- cgit v1.2.3 From ab5d23b62069e6dfcb5d0e717730d5957c0f9490 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 13:38:12 +0000 Subject: Merge stream/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26515 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7a8ce893b7..bed6440d2f 100644 --- a/Makefile +++ b/Makefile @@ -155,10 +155,26 @@ SRCS_COMMON = asxparser.c \ libvo/sub.c \ osdep/$(GETCH) \ osdep/$(TIMER) \ + stream/open.c \ + stream/stream.c \ + stream/stream_cue.c \ + stream/stream_file.c \ + stream/stream_mf.c \ + stream/stream_null.c \ + stream/url.c \ SRCS_COMMON-$(BITMAP_FONT) += libvo/font_load.c +SRCS_COMMON-$(CDDA) += stream/stream_cdda.c \ + stream/cdinfo.c +SRCS_COMMON-$(CDDB) += stream/stream_cddb.c +SRCS_COMMON-$(DVBIN) += stream/dvb_tune.c \ + stream/stream_dvb.c +SRCS_COMMON-$(DVDNAV) += stream/stream_dvdnav.c +SRCS_COMMON-$(DVDREAD) += stream/stream_dvd.c \ + stream/stream_dvd_common.c SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c +SRCS_COMMON-$(FTP) += stream/stream_ftp.c SRCS_COMMON-$(HAVE_POSIX_SELECT) += libmpcodecs/vf_bmovl.c SRCS_COMMON-$(HAVE_SYS_MMAN_H) += osdep/mmap_anon.c SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c @@ -197,12 +213,40 @@ SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ libmpcodecs/vd_libdv.c SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c +SRCS_COMMON-$(LIBNEMESI) += stream/stream_nemesi.c SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c +SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c SRCS_COMMON-$(LIBVORBIS) += libmpcodecs/ad_libvorbis.c SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c +SRCS_COMMON-$(MPLAYER_NETWORK) += stream/stream_netstream.c \ + stream/asf_mmst_streaming.c \ + stream/asf_streaming.c \ + stream/cookies.c \ + stream/http.c \ + stream/network.c \ + stream/pnm.c \ + stream/rtp.c \ + stream/udp.c \ + stream/tcp.c \ + stream/stream_rtp.c \ + stream/stream_udp.c \ + stream/realrtsp/asmrp.c \ + stream/realrtsp/real.c \ + stream/realrtsp/rmff.c \ + stream/realrtsp/sdpplin.c \ + stream/realrtsp/xbuffer.c \ + SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c +SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \ + stream/freesdp/common.c \ + stream/freesdp/errorlist.c \ + stream/freesdp/parser.c \ + stream/librtsp/rtsp.c \ + stream/librtsp/rtsp_rtp.c \ + stream/librtsp/rtsp_session.c \ + SRCS_COMMON-$(NEED_GETTIMEOFDAY) += osdep/gettimeofday.c SRCS_COMMON-$(NEED_GLOB) += osdep/glob-win.c SRCS_COMMON-$(NEED_MMAP) += osdep/mmap-os2.c @@ -212,11 +256,16 @@ SRCS_COMMON-$(NEED_STRSEP) += osdep/strsep.c SRCS_COMMON-$(NEED_SWAB) += osdep/swab.c SRCS_COMMON-$(NEED_VSSCANF) += osdep/vsscanf.c SRCS_COMMON-$(PNG) += libmpcodecs/vd_mpng.c +SRCS_COMMON-$(PVR) += stream/stream_pvr.c SRCS_COMMON-$(QTX_CODECS) += libmpcodecs/ad_qtaudio.c \ libmpcodecs/vd_qtvideo.c +SRCS_COMMON-$(RADIO) += stream/stream_radio.c +SRCS_COMMON-$(RADIO_CAPTURE) += stream/audio_in.c SRCS_COMMON-$(REAL_CODECS) += libmpcodecs/ad_realaud.c \ libmpcodecs/vd_realvid.c SRCS_COMMON-$(SPEEX) += libmpcodecs/ad_speex.c +SRCS_COMMON-$(STREAM_CACHE) += stream/cache2.c +SRCS_COMMON-$(STREAMING_LIVE555) += stream/stream_livedotcom.c SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \ tremor/block.c \ tremor/codebook.c \ @@ -232,7 +281,16 @@ SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \ tremor/synthesis.c \ tremor/window.c \ +SRCS_COMMON-$(TV) += stream/stream_tv.c stream/tv.c \ + stream/frequencies.c stream/tvi_dummy.c +SRCS_COMMON-$(TV_BSDBT848) += stream/tvi_bsdbt848.c +SRCS_COMMON-$(TV_DSHOW) += stream/tvi_dshow.c +SRCS_COMMON-$(TV_TELETEXT) += stream/tvi_vbi.c +SRCS_COMMON-$(TV_V4L1) += stream/tvi_v4l.c stream/audio_in.c +SRCS_COMMON-$(TV_V4L2) += stream/tvi_v4l2.c stream/audio_in.c SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c +SRCS_COMMON-$(VCD) += stream/stream_vcd.c +SRCS_COMMON-$(VSTREAM) += stream/stream_vstream.c SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \ libmpcodecs/ad_dmo.c \ libmpcodecs/ad_dshow.c \ @@ -246,6 +304,12 @@ SRCS_COMMON-$(XANIM_CODECS) += libmpcodecs/vd_xanim.c SRCS_COMMON-$(XVID4) += libmpcodecs/vd_xvid4.c SRCS_COMMON-$(ZORAN) += libmpcodecs/vd_zrmjpeg.c \ libmpcodecs/vf_zrmjpeg.c +ifeq ($(AUDIO_INPUT),yes) +SRCS_COMMON-$(ALSA1X) += stream/ai_alsa1x.c +SRCS_COMMON-$(ALSA9) += stream/ai_alsa.c +SRCS_COMMON-$(OSS) += stream/ai_oss.c +endif + SRCS_MPLAYER = mplayer.c \ m_property.c \ @@ -348,7 +412,6 @@ SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c COMMON_LIBS = libmpdemux/libmpdemux.a \ - stream/stream.a \ libswscale/libswscale.a \ COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a @@ -395,7 +458,6 @@ PARTS = dvdread \ libpostproc \ libswscale \ mp3lib \ - stream \ vidix \ ifdef ARCH_X86 @@ -417,6 +479,10 @@ DIRS = gui \ libmpcodecs/native \ libvo \ osdep \ + stream \ + stream/freesdp \ + stream/librtsp \ + stream/realrtsp \ tremor \ TOOLS \ @@ -630,7 +696,6 @@ fastmemcpybench realcodecs: CFLAGS += -g # FIXME: netstream linking is a mess that should be fixed properly some day. # It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled. NETSTREAM_DEPS = libmpdemux/libmpdemux.a \ - stream/stream.a \ dvdread/libdvdread.a \ libdvdcss/libdvdcss.a \ libavutil/libavutil.a \ -- cgit v1.2.3 From 9551fc7e63bb5e7d484bf0cb74d061c4318da01c Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 15:32:44 +0000 Subject: Expand conditional addition of elements to variables with a form that permits using two conditions. This allows getting rid of some ifeqs in Makefiles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26516 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bed6440d2f..5ccb1f5778 100644 --- a/Makefile +++ b/Makefile @@ -163,6 +163,9 @@ SRCS_COMMON = asxparser.c \ stream/stream_null.c \ stream/url.c \ +SRCS_COMMON-$(AUDIO_INPUT)-$(ALSA1X) += stream/ai_alsa1x.c +SRCS_COMMON-$(AUDIO_INPUT)-$(ALSA9) += stream/ai_alsa.c +SRCS_COMMON-$(AUDIO_INPUT)-$(OSS) += stream/ai_oss.c SRCS_COMMON-$(BITMAP_FONT) += libvo/font_load.c SRCS_COMMON-$(CDDA) += stream/stream_cdda.c \ stream/cdinfo.c @@ -304,11 +307,6 @@ SRCS_COMMON-$(XANIM_CODECS) += libmpcodecs/vd_xanim.c SRCS_COMMON-$(XVID4) += libmpcodecs/vd_xvid4.c SRCS_COMMON-$(ZORAN) += libmpcodecs/vd_zrmjpeg.c \ libmpcodecs/vf_zrmjpeg.c -ifeq ($(AUDIO_INPUT),yes) -SRCS_COMMON-$(ALSA1X) += stream/ai_alsa1x.c -SRCS_COMMON-$(ALSA9) += stream/ai_alsa.c -SRCS_COMMON-$(OSS) += stream/ai_oss.c -endif SRCS_MPLAYER = mplayer.c \ -- cgit v1.2.3 From 1b7adb682202d310cff714b355164a2b29c877c6 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 17:26:57 +0000 Subject: Make sure necessary header files are created before recursing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26519 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5ccb1f5778..1df6c6cfd2 100644 --- a/Makefile +++ b/Makefile @@ -490,7 +490,7 @@ recurse: for part in $(PARTS); do $(MAKE) -C $$part; done DEPS = $(SRCS_COMMON:.c=.d) $(SRCS_MPLAYER:.c=.d) $(SRCS_MENCODER:.c=.d) -$(DEPS): help_mp.h version.h codecs.conf.h +$(DEPS) recurse: help_mp.h version.h codecs.conf.h dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part .depend; done -- cgit v1.2.3 From b5653b5698b468d2f5528979e331ec21eb868562 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 17:41:19 +0000 Subject: Include mpcommon.mak before declaring dependencies, which require mpcommon.mak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26520 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1df6c6cfd2..cc9450470f 100644 --- a/Makefile +++ b/Makefile @@ -489,13 +489,16 @@ all: recurse $(ALL_PRG) recurse: for part in $(PARTS); do $(MAKE) -C $$part; done +# Hack to keep .depend from being generated at the top level unnecessarily. +DEPS = foo + +include mpcommon.mak + DEPS = $(SRCS_COMMON:.c=.d) $(SRCS_MPLAYER:.c=.d) $(SRCS_MENCODER:.c=.d) $(DEPS) recurse: help_mp.h version.h codecs.conf.h dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part .depend; done -include mpcommon.mak - CFLAGS := $(subst -I..,-I.,$(CFLAGS)) define RECURSIVE_RULE -- cgit v1.2.3 From e7f6edf300f9d465c92a6112c8f782ccb53c26eb Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 21:46:50 +0000 Subject: dependency generation infrastructure for C++ files git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26521 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cc9450470f..0face2127f 100644 --- a/Makefile +++ b/Makefile @@ -494,7 +494,7 @@ DEPS = foo include mpcommon.mak -DEPS = $(SRCS_COMMON:.c=.d) $(SRCS_MPLAYER:.c=.d) $(SRCS_MENCODER:.c=.d) +DEPS = $(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER) $(SRCS_MENCODER))) $(DEPS) recurse: help_mp.h version.h codecs.conf.h dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part .depend; done -- cgit v1.2.3 From 83f7e53ecaca8b4961bbc84dfbd0bf9307d8c8ef Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 21:58:45 +0000 Subject: Explicitly include dependency information in top-level Makefile. The inclusion is skipped in mpcommon.mak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26522 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0face2127f..046bf54d40 100644 --- a/Makefile +++ b/Makefile @@ -711,4 +711,6 @@ toolsclean: rm -f $(TOOLS) TOOLS/fastmem*-* TOOLS/netstream$(EXESUF) rm -f TOOLS/bmovl-test$(EXESUF) TOOLS/vfw2menc$(EXESUF) $(REAL_TARGETS) +-include $(DEPS) + .PHONY: all doxygen *install* recurse strip tools -- cgit v1.2.3 From aaf2c51e8abb42a3fda320ca626d4258a54d05ad Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 22:05:43 +0000 Subject: Merge libmpdemux/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26523 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 73 insertions(+), 16 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 046bf54d40..642941c9f2 100644 --- a/Makefile +++ b/Makefile @@ -150,6 +150,50 @@ SRCS_COMMON = asxparser.c \ libmpcodecs/vf_yuvcsp.c \ libmpcodecs/vf_yuy2.c \ libmpcodecs/vf_yvu9.c \ + libmpdemux/aac_hdr.c \ + libmpdemux/asfheader.c \ + libmpdemux/aviheader.c \ + libmpdemux/aviprint.c \ + libmpdemux/demuxer.c \ + libmpdemux/demux_aac.c \ + libmpdemux/demux_asf.c \ + libmpdemux/demux_audio.c \ + libmpdemux/demux_avi.c \ + libmpdemux/demux_demuxers.c \ + libmpdemux/demux_film.c \ + libmpdemux/demux_fli.c \ + libmpdemux/demux_lmlm4.c \ + libmpdemux/demux_mf.c \ + libmpdemux/demux_mkv.c \ + libmpdemux/demux_mov.c \ + libmpdemux/demux_mpg.c \ + libmpdemux/demux_nsv.c \ + libmpdemux/demux_nuv.c \ + libmpdemux/demux_pva.c \ + libmpdemux/demux_rawaudio.c \ + libmpdemux/demux_rawvideo.c \ + libmpdemux/demux_realaud.c \ + libmpdemux/demux_real.c \ + libmpdemux/demux_roq.c \ + libmpdemux/demux_smjpeg.c \ + libmpdemux/demux_ts.c \ + libmpdemux/demux_ty.c \ + libmpdemux/demux_ty_osd.c \ + libmpdemux/demux_viv.c \ + libmpdemux/demux_vqf.c \ + libmpdemux/demux_y4m.c \ + libmpdemux/ebml.c \ + libmpdemux/extension.c \ + libmpdemux/mf.c \ + libmpdemux/mp3_hdr.c \ + libmpdemux/mp_taglists.c \ + libmpdemux/mpeg_hdr.c \ + libmpdemux/mpeg_packetizer.c \ + libmpdemux/parse_es.c \ + libmpdemux/parse_mp4.c \ + libmpdemux/video.c \ + libmpdemux/yuv4mpeg.c \ + libmpdemux/yuv4mpeg_ratio.c \ libvo/aclib.c \ libvo/osd.c \ libvo/sub.c \ @@ -178,6 +222,7 @@ SRCS_COMMON-$(DVDREAD) += stream/stream_dvd.c \ SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c SRCS_COMMON-$(FTP) += stream/stream_ftp.c +SRCS_COMMON-$(GIF) += libmpdemux/demux_gif.c SRCS_COMMON-$(HAVE_POSIX_SELECT) += libmpcodecs/vf_bmovl.c SRCS_COMMON-$(HAVE_SYS_MMAN_H) += osdep/mmap_anon.c SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c @@ -211,16 +256,21 @@ SRCS_COMMON-$(LIBAVCODEC_A) += libaf/af_lavcac3enc.c \ libmpcodecs/vf_spp.c \ libmpcodecs/vf_uspp.c \ +SRCS_COMMON-$(LIBAVFORMAT) += libmpdemux/demux_lavf.c SRCS_COMMON-$(LIBDCA) += libmpcodecs/ad_libdca.c SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ - libmpcodecs/vd_libdv.c + libmpcodecs/vd_libdv.c \ + libmpdemux/demux_rawdv.c SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c -SRCS_COMMON-$(LIBNEMESI) += stream/stream_nemesi.c +SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \ + stream/stream_nemesi.c +SRCS_COMMON-$(LIBNUT) += libmpdemux/demux_nut.c SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c -SRCS_COMMON-$(LIBVORBIS) += libmpcodecs/ad_libvorbis.c +SRCS_COMMON-$(LIBVORBIS) += libmpcodecs/ad_libvorbis.c \ + libmpdemux/demux_ogg.c SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c SRCS_COMMON-$(MPLAYER_NETWORK) += stream/stream_netstream.c \ @@ -241,7 +291,8 @@ SRCS_COMMON-$(MPLAYER_NETWORK) += stream/stream_netstream.c \ stream/realrtsp/sdpplin.c \ stream/realrtsp/xbuffer.c \ -SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c +SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \ + libmpdemux/demux_mpc.c SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \ stream/freesdp/common.c \ stream/freesdp/errorlist.c \ @@ -268,7 +319,10 @@ SRCS_COMMON-$(REAL_CODECS) += libmpcodecs/ad_realaud.c \ libmpcodecs/vd_realvid.c SRCS_COMMON-$(SPEEX) += libmpcodecs/ad_speex.c SRCS_COMMON-$(STREAM_CACHE) += stream/cache2.c -SRCS_COMMON-$(STREAMING_LIVE555) += stream/stream_livedotcom.c +SRCS_COMMON-$(STREAMING_LIVE555) += libmpdemux/demux_rtp.cpp \ + libmpdemux/demux_rtp_codec.cpp \ + stream/stream_livedotcom.c \ + SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \ tremor/block.c \ tremor/codebook.c \ @@ -302,8 +356,10 @@ SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \ libmpcodecs/vd_dshow.c \ libmpcodecs/vd_vfw.c \ libmpcodecs/vd_vfwex.c \ + libmpdemux/demux_avs.c \ SRCS_COMMON-$(XANIM_CODECS) += libmpcodecs/vd_xanim.c +SRCS_COMMON-$(XMMS_PLUGINS) += libmpdemux/demux_xmms.c SRCS_COMMON-$(XVID4) += libmpcodecs/vd_xvid4.c SRCS_COMMON-$(ZORAN) += libmpcodecs/vd_zrmjpeg.c \ libmpcodecs/vf_zrmjpeg.c @@ -396,9 +452,15 @@ SRCS_MENCODER = mencoder.c \ libmpcodecs/ae_pcm.c \ libmpcodecs/ve.c \ libmpcodecs/ve_raw.c \ + libmpdemux/muxer.c \ + libmpdemux/muxer_avi.c \ + libmpdemux/muxer_mpeg.c \ + libmpdemux/muxer_rawaudio.c \ + libmpdemux/muxer_rawvideo.c \ SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c SRCS_MENCODER-$(LIBAVCODEC) += libmpcodecs/ae_lavc.c libmpcodecs/ve_lavc.c +SRCS_MENCODER-$(LIBAVFORMAT) += libmpdemux/muxer_lavf.c SRCS_MENCODER-$(LIBDV) += libmpcodecs/ve_libdv.c SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c SRCS_MENCODER-$(MP3LAME) += libmpcodecs/ae_lame.c @@ -409,8 +471,7 @@ SRCS_MENCODER-$(WIN32DLL) += libmpcodecs/ve_vfw.c SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c -COMMON_LIBS = libmpdemux/libmpdemux.a \ - libswscale/libswscale.a \ +COMMON_LIBS = libswscale/libswscale.a \ COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a @@ -426,8 +487,6 @@ COMMON_LIBS-$(DVDCSS_INTERNAL) += libdvdcss/libdvdcss.a LIBS_MPLAYER-$(VIDIX) += vidix/vidix.a -LIBS_MENCODER = libmpdemux/libmpmux.a \ - ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) ALL_PRG-$(MENCODER) += mencoder$(EXESUF) @@ -451,7 +510,6 @@ PARTS = dvdread \ libavutil \ libdvdcss \ libfaad2 \ - libmpdemux \ libmpeg2 \ libpostproc \ libswscale \ @@ -475,6 +533,7 @@ DIRS = gui \ libmenu \ libmpcodecs \ libmpcodecs/native \ + libmpdemux \ libvo \ osdep \ stream \ @@ -508,9 +567,6 @@ endef $(foreach part,$(PARTS),$(eval $(RECURSIVE_RULE))) -libmpdemux/libmpmux.a: - $(MAKE) -C libmpdemux libmpmux.a - mplayer$(EXESUF): $(MPLAYER_DEPS) $(CC) -o $@ $^ $(LDFLAGS_MPLAYER) @@ -534,6 +590,8 @@ codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o osdep/mplayer-rc.o: osdep/mplayer.rc version.h $(WINDRES) -o $@ $< +libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Ilibavcodec + install: install-dirs $(INSTALL_TARGETS) install-dirs: @@ -672,7 +730,7 @@ TOOLS/subrip$(EXESUF): TOOLS/subrip.c vobsub.o spudec.o unrar_exec.o \ TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32 #FIXME: Linking is broken, help welcome. -TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c libmpdemux/libmpdemux.a $(TOOLS_COMMON_LIBS) +TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c $(TOOLS_COMMON_LIBS) fastmemcpybench: TOOLS/fastmemcpybench.c $(CC) $(CFLAGS) $< -o TOOLS/fastmem-mmx$(EXESUF) -DNAME=\"mmx\" -DHAVE_MMX @@ -696,8 +754,7 @@ fastmemcpybench realcodecs: CFLAGS += -g # FIXME: netstream linking is a mess that should be fixed properly some day. # It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled. -NETSTREAM_DEPS = libmpdemux/libmpdemux.a \ - dvdread/libdvdread.a \ +NETSTREAM_DEPS = dvdread/libdvdread.a \ libdvdcss/libdvdcss.a \ libavutil/libavutil.a \ m_option.o \ -- cgit v1.2.3 From 4267826b6bde2f18beed0637181cba5b5f814fde Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 22:27:01 +0000 Subject: Merge libdvdcss/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26524 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 642941c9f2..1d8fe332e8 100644 --- a/Makefile +++ b/Makefile @@ -261,6 +261,13 @@ SRCS_COMMON-$(LIBDCA) += libmpcodecs/ad_libdca.c SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ libmpcodecs/vd_libdv.c \ libmpdemux/demux_rawdv.c +SRCS_COMMON-$(DVDCSS_INTERNAL) += libdvdcss/css.c \ + libdvdcss/device.c \ + libdvdcss/error.c \ + libdvdcss/ioctl.c \ + libdvdcss/libdvdcss.c \ + #libdvdcss/bsdi_ioctl \ + SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \ @@ -483,7 +490,6 @@ COMMON_LIBS-$(LIBA52) += liba52/liba52.a COMMON_LIBS-$(LIBMPEG2) += libmpeg2/libmpeg2.a COMMON_LIBS-$(FAAD_INTERNAL) += libfaad2/libfaad2.a COMMON_LIBS-$(DVDREAD_INTERNAL) += dvdread/dvdread.a -COMMON_LIBS-$(DVDCSS_INTERNAL) += libdvdcss/libdvdcss.a LIBS_MPLAYER-$(VIDIX) += vidix/vidix.a @@ -508,7 +514,6 @@ PARTS = dvdread \ libavcodec \ libavformat \ libavutil \ - libdvdcss \ libfaad2 \ libmpeg2 \ libpostproc \ @@ -530,6 +535,7 @@ DIRS = gui \ libaf \ libao2 \ libass \ + libdvdcss \ libmenu \ libmpcodecs \ libmpcodecs/native \ @@ -590,6 +596,8 @@ codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o osdep/mplayer-rc.o: osdep/mplayer.rc version.h $(WINDRES) -o $@ $< +libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" + libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Ilibavcodec install: install-dirs $(INSTALL_TARGETS) @@ -755,7 +763,6 @@ fastmemcpybench realcodecs: CFLAGS += -g # FIXME: netstream linking is a mess that should be fixed properly some day. # It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled. NETSTREAM_DEPS = dvdread/libdvdread.a \ - libdvdcss/libdvdcss.a \ libavutil/libavutil.a \ m_option.o \ m_struct.o \ -- cgit v1.2.3 From cc339fac3a7ce0ac732d0f2af368eea9c2630f7c Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 22:30:50 +0000 Subject: Rename make variable DVDCSS_INTERNAL --> LIBDVDCSS_INTERNAL. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26525 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1d8fe332e8..0c810bd35b 100644 --- a/Makefile +++ b/Makefile @@ -261,7 +261,7 @@ SRCS_COMMON-$(LIBDCA) += libmpcodecs/ad_libdca.c SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ libmpcodecs/vd_libdv.c \ libmpdemux/demux_rawdv.c -SRCS_COMMON-$(DVDCSS_INTERNAL) += libdvdcss/css.c \ +SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \ libdvdcss/device.c \ libdvdcss/error.c \ libdvdcss/ioctl.c \ -- cgit v1.2.3 From 49aea49605c3f919eb066d1e6bdc03d74bad1973 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 23:11:16 +0000 Subject: Merge libfaad2/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26526 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0c810bd35b..83d42f3363 100644 --- a/Makefile +++ b/Makefile @@ -268,6 +268,45 @@ SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \ libdvdcss/libdvdcss.c \ #libdvdcss/bsdi_ioctl \ +SRCS_COMMON-$(FAAD_INTERNAL) += libfaad2/bits.c \ + libfaad2/cfft.c \ + libfaad2/common.c \ + libfaad2/decoder.c \ + libfaad2/drc.c \ + libfaad2/drm_dec.c \ + libfaad2/error.c \ + libfaad2/filtbank.c \ + libfaad2/hcr.c \ + libfaad2/huffman.c \ + libfaad2/ic_predict.c \ + libfaad2/is.c \ + libfaad2/lt_predict.c \ + libfaad2/mdct.c \ + libfaad2/mp4.c \ + libfaad2/ms.c \ + libfaad2/output.c \ + libfaad2/pns.c \ + libfaad2/ps_dec.c \ + libfaad2/ps_syntax.c \ + libfaad2/pulse.c \ + libfaad2/rvlc.c \ + libfaad2/sbr_dct.c \ + libfaad2/sbr_dec.c \ + libfaad2/sbr_e_nf.c \ + libfaad2/sbr_fbt.c \ + libfaad2/sbr_hfadj.c \ + libfaad2/sbr_hfgen.c \ + libfaad2/sbr_huff.c \ + libfaad2/sbr_qmf.c \ + libfaad2/sbr_syntax.c \ + libfaad2/sbr_tf_grid.c \ + libfaad2/specrec.c \ + libfaad2/ssr.c \ + libfaad2/ssr_fb.c \ + libfaad2/ssr_ipqf.c \ + libfaad2/syntax.c \ + libfaad2/tns.c \ + SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \ @@ -488,7 +527,6 @@ COMMON_LIBS-$(WIN32DLL) += loader/loader.a COMMON_LIBS-$(MP3LIB) += mp3lib/mp3lib.a COMMON_LIBS-$(LIBA52) += liba52/liba52.a COMMON_LIBS-$(LIBMPEG2) += libmpeg2/libmpeg2.a -COMMON_LIBS-$(FAAD_INTERNAL) += libfaad2/libfaad2.a COMMON_LIBS-$(DVDREAD_INTERNAL) += dvdread/dvdread.a LIBS_MPLAYER-$(VIDIX) += vidix/vidix.a @@ -514,7 +552,6 @@ PARTS = dvdread \ libavcodec \ libavformat \ libavutil \ - libfaad2 \ libmpeg2 \ libpostproc \ libswscale \ @@ -536,6 +573,7 @@ DIRS = gui \ libao2 \ libass \ libdvdcss \ + libfaad2 \ libmenu \ libmpcodecs \ libmpcodecs/native \ @@ -597,6 +635,7 @@ osdep/mplayer-rc.o: osdep/mplayer.rc version.h $(WINDRES) -o $@ $< libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" +libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Ilibavcodec -- cgit v1.2.3 From 61d97d630e807ce958c0496e1a138d4fe16b34b3 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 25 Apr 2008 08:25:17 +0000 Subject: Merge dvdread/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26528 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 83d42f3363..51e338774d 100644 --- a/Makefile +++ b/Makefile @@ -219,6 +219,16 @@ SRCS_COMMON-$(DVBIN) += stream/dvb_tune.c \ SRCS_COMMON-$(DVDNAV) += stream/stream_dvdnav.c SRCS_COMMON-$(DVDREAD) += stream/stream_dvd.c \ stream/stream_dvd_common.c +SRCS_COMMON-$(DVDREAD_INTERNAL) += dvdread/cmd_print.c \ + dvdread/dvd_input.c \ + dvdread/dvd_reader.c \ + dvdread/dvd_udf.c \ + dvdread/ifo_print.c \ + dvdread/ifo_read.c \ + dvdread/md5.c \ + dvdread/nav_print.c \ + dvdread/nav_read.c \ + SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c SRCS_COMMON-$(FTP) += stream/stream_ftp.c @@ -527,7 +537,6 @@ COMMON_LIBS-$(WIN32DLL) += loader/loader.a COMMON_LIBS-$(MP3LIB) += mp3lib/mp3lib.a COMMON_LIBS-$(LIBA52) += liba52/liba52.a COMMON_LIBS-$(LIBMPEG2) += libmpeg2/libmpeg2.a -COMMON_LIBS-$(DVDREAD_INTERNAL) += dvdread/dvdread.a LIBS_MPLAYER-$(VIDIX) += vidix/vidix.a @@ -547,8 +556,7 @@ INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man INSTALL_TARGETS-$(GUI) += install-gui INSTALL_TARGETS += $(INSTALL_TARGETS-yes) -PARTS = dvdread \ - liba52 \ +PARTS = liba52 \ libavcodec \ libavformat \ libavutil \ @@ -562,7 +570,8 @@ ifdef ARCH_X86 PARTS += loader endif -DIRS = gui \ +DIRS = dvdread \ + gui \ gui/mplayer \ gui/mplayer/gtk \ gui/skin \ @@ -634,6 +643,10 @@ codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o osdep/mplayer-rc.o: osdep/mplayer.rc version.h $(WINDRES) -o $@ $< +dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE +ifeq ($(LIBDVDCSS_INTERNAL),yes) +dvdread/%.o dvdread/%.d: CFLAGS += -Ilibdvdcss -DHAVE_DVDCSS_DVDCSS_H +endif libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE @@ -801,8 +814,7 @@ fastmemcpybench realcodecs: CFLAGS += -g # FIXME: netstream linking is a mess that should be fixed properly some day. # It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled. -NETSTREAM_DEPS = dvdread/libdvdread.a \ - libavutil/libavutil.a \ +NETSTREAM_DEPS = libavutil/libavutil.a \ m_option.o \ m_struct.o \ $(TOOLS_COMMON_LIBS) -- cgit v1.2.3 From ffed0ab3d265bf13e67fc77e1b5abf153e652508 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 25 Apr 2008 16:58:31 +0000 Subject: Only add loader to parts if WIN32DLL is enabled. Plus, some unrelated changes to mp3lib/Makefile committed by accident. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26539 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 51e338774d..3d2fd7d367 100644 --- a/Makefile +++ b/Makefile @@ -566,7 +566,7 @@ PARTS = liba52 \ mp3lib \ vidix \ -ifdef ARCH_X86 +ifeq ($(WIN32DLL),yes) PARTS += loader endif -- cgit v1.2.3