diff options
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 172 |
1 files changed, 37 insertions, 135 deletions
@@ -115,20 +115,8 @@ SRCS_COMMON-$(LIBA52_INTERNAL) += liba52/crc.c \ liba52/imdct.c \ liba52/parse.c \ -SRCS_COMMON-$(LIBASS) += libmpcodecs/vf_ass.c \ - libass/ass_mp.c \ - -SRCS_COMMON-$(LIBASS_INTERNAL) += libass/ass.c \ - libass/ass_bitmap.c \ - libass/ass_cache.c \ - libass/ass_drawing.c \ - libass/ass_font.c \ - libass/ass_fontconfig.c \ - libass/ass_library.c \ - libass/ass_parse.c \ - libass/ass_render.c \ - libass/ass_strtod.c \ - libass/ass_utils.c \ +SRCS_COMMON-$(LIBASS) += ass_mp.c \ + libmpcodecs/vf_ass.c \ SRCS_COMMON-$(LIBAVCODEC) += av_opts.c \ libaf/af_lavcresample.c \ @@ -137,15 +125,15 @@ SRCS_COMMON-$(LIBAVCODEC) += av_opts.c \ libmpcodecs/vf_lavc.c \ libmpcodecs/vf_lavcdeint.c \ libmpcodecs/vf_screenshot.c \ + libmpcodecs/vf_uspp.c \ # These filters use private headers and do not work with shared libavcodec. -SRCS_COMMON-$(LIBAVCODEC_A) += libaf/af_lavcac3enc.c \ +SRCS_COMMON-$(LIBAVCODEC_INTERNALS) += 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-$(LIBAVFORMAT) += libmpdemux/demux_lavf.c \ stream/stream_ffmpeg.c \ @@ -188,6 +176,10 @@ SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_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-$(LIBSWSCALE_INTERNALS) += libmpcodecs/vf_halfpack.c \ + libmpcodecs/vf_palette.c \ + libmpcodecs/vf_rgb2bgr.c \ + libmpcodecs/vf_yuy2.c SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \ libmpdemux/demux_rtp_codec.cpp \ @@ -330,8 +322,10 @@ SRCS_COMMON-$(XVID4) += libmpcodecs/vd_xvid4.c SRCS_COMMON-$(ZR) += libmpcodecs/vd_zrmjpeg.c \ libmpcodecs/vf_zrmjpeg.c SRCS_COMMON = asxparser.c \ + av_log.c \ codec-cfg.c \ cpudetect.c \ + defaultopts.c \ edl.c \ find_sub.c \ fmt-conversion.c \ @@ -347,6 +341,7 @@ SRCS_COMMON = asxparser.c \ sub_cc.c \ subopt-helper.c \ subreader.c \ + talloc.c \ vobsub.c \ libaf/af.c \ libaf/af_center.c \ @@ -426,7 +421,6 @@ SRCS_COMMON = asxparser.c \ libmpcodecs/vf_format.c \ libmpcodecs/vf_framestep.c \ libmpcodecs/vf_gradfun.c \ - libmpcodecs/vf_halfpack.c \ libmpcodecs/vf_harddup.c \ libmpcodecs/vf_hqdn3d.c \ libmpcodecs/vf_hue.c \ @@ -438,14 +432,12 @@ SRCS_COMMON = asxparser.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 \ @@ -463,7 +455,6 @@ SRCS_COMMON = asxparser.c \ libmpcodecs/vf_vo.c \ libmpcodecs/vf_yadif.c \ libmpcodecs/vf_yuvcsp.c \ - libmpcodecs/vf_yuy2.c \ libmpcodecs/vf_yvu9.c \ libmpdemux/aac_hdr.c \ libmpdemux/asfheader.c \ @@ -510,6 +501,7 @@ SRCS_COMMON = asxparser.c \ libmpdemux/yuv4mpeg_ratio.c \ libvo/osd.c \ libvo/sub.c \ + osdep/findfiles.c \ osdep/$(GETCH) \ osdep/$(TIMER) \ stream/open.c \ @@ -550,41 +542,6 @@ SRCS_MPLAYER-$(GL) += libvo/gl_common.c libvo/vo_gl.c libvo/vo_gl2.c l SRCS_MPLAYER-$(GL_WIN32) += libvo/w32_common.c SRCS_MPLAYER-$(GL_X11) += libvo/x11_common.c SRCS_MPLAYER-$(MATRIXVIEW) += libvo/vo_matrixview.c libvo/matrixview.c -SRCS_MPLAYER-$(GUI) += gui/bitmap.c -SRCS_MPLAYER-$(GUI_GTK) += gui/app.c \ - gui/cfg.c \ - gui/interface.c \ - gui/mplayer/gui_common.c \ - gui/mplayer/menu.c \ - gui/mplayer/mw.c \ - gui/mplayer/pb.c \ - gui/mplayer/play.c \ - gui/mplayer/sw.c \ - gui/mplayer/widgets.c \ - gui/mplayer/gtk/about.c \ - gui/mplayer/gtk/eq.c \ - gui/mplayer/gtk/fs.c \ - gui/mplayer/gtk/gtk_common.c \ - gui/mplayer/gtk/gtk_url.c \ - gui/mplayer/gtk/mb.c \ - gui/mplayer/gtk/menu.c \ - gui/mplayer/gtk/opts.c \ - gui/mplayer/gtk/pl.c \ - gui/mplayer/gtk/sb.c \ - gui/skin/cut.c \ - gui/skin/font.c \ - gui/skin/skin.c \ - gui/wm/ws.c \ - gui/wm/wsxdnd.c \ - -SRCS_MPLAYER-$(GUI_WIN32) += gui/win32/dialogs.c \ - gui/win32/gui.c \ - gui/win32/interface.c \ - gui/win32/playlist.c \ - gui/win32/preferences.c \ - gui/win32/skinload.c \ - gui/win32/widgetrender.c \ - gui/win32/wincfg.c \ SRCS_MPLAYER-$(IVTV) += libao2/ao_ivtv.c libvo/vo_ivtv.c SRCS_MPLAYER-$(JACK) += libao2/ao_jack.c @@ -675,6 +632,7 @@ SRCS_MPLAYER = command.c \ libao2/audio_out.c \ libvo/aspect.c \ libvo/geometry.c \ + libvo/old_vo_wrapper.c \ libvo/spuenc.c \ libvo/video_out.c \ libvo/vo_mpegpes.c \ @@ -710,12 +668,6 @@ SRCS_MENCODER = mencoder.c \ libmpdemux/muxer_rawvideo.c \ $(SRCS_MENCODER-yes) - -COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a -COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a -COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a -COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a -COMMON_LIBS-$(LIBSWSCALE_A) += libswscale/libswscale.a COMMON_LIBS += $(COMMON_LIBS-yes) OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON))) @@ -731,38 +683,15 @@ DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $ ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) ALL_PRG-$(MENCODER) += mencoder$(EXESUF) -INSTALL_TARGETS-$(GUI) += install-gui INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mencoder-man INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man DIRS = . \ - gui \ - gui/mplayer \ - gui/mplayer/gtk \ - gui/skin \ - gui/wm \ - gui/win32 \ input \ liba52 \ libaf \ libao2 \ libass \ - libavcodec \ - libavcodec/alpha \ - libavcodec/arm \ - libavcodec/bfin \ - libavcodec/mlib \ - libavcodec/ppc \ - libavcodec/sh4 \ - libavcodec/sparc \ - libavcodec/x86 \ - libavformat \ - libavutil \ - libavutil/arm \ - libavutil/bfin \ - libavutil/ppc \ - libavutil/sh4 \ - libavutil/x86 \ libdvdcss \ libdvdnav \ libdvdnav/vm \ @@ -773,7 +702,6 @@ DIRS = . \ libmpcodecs/native \ libmpdemux \ libmpeg2 \ - libpostproc \ libswscale \ libswscale/bfin \ libswscale/mlib \ @@ -801,47 +729,28 @@ ADDSUFFIXES = $(foreach suf,$(1),$(addsuffix $(suf),$(2))) ADD_ALL_DIRS = $(call ADDSUFFIXES,$(1),$(DIRS)) ADD_ALL_EXESUFS = $(1) $(call ADDSUFFIXES,$(EXESUFS_ALL),$(1)) -FFMPEGPARTS = libavcodec \ - libavformat \ - libavutil \ - libpostproc \ - libswscale \ - -FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), $(part)/$(part).a) -FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(wildcard $(part)/*.[chS] $(part)/*/*.[chS])) - - - ###### generic rules ####### all: $(ALL_PRG-yes) -%.d: %.c - $(MPDEPEND_CMD) > $@ +%.o: %.c + $(CC) $(CFLAGS) -c -o $@ -MD -MP -MF $*.d $< -%.d: %.cpp - $(MPDEPEND_CMD_CXX) > $@ +%.o: %.cpp + $(CXX) $(CXXFLAGS) -c -o $@ -MD -MP -MF $*.d $< -%.d: %.m - $(MPDEPEND_CMD) > $@ +%.o: %.m + $(CC) $(CFLAGS) -c -o $@ -MD -MP -MF $*.d $< %.ho: %.h $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $< -%.o: %.m - $(CC) $(CFLAGS) -c -o $@ $< - %-rc.o: %.rc $(WINDRES) -I. $< $@ checkheaders: $(ALLHEADERS:.h=.ho) dep depend: $(DEPS) - for part in $(FFMPEGPARTS); do $(MAKE) -C $$part depend; done - -$(FFMPEGLIBS): $(FFMPEGFILES) config.h - $(MAKE) -C $(@D) - touch $@ mencoder$(EXESUF): $(MENCODER_DEPS) mencoder$(EXESUF): EXTRALIBS += $(EXTRALIBS_MENCODER) @@ -850,7 +759,7 @@ mplayer$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER) mencoder$(EXESUF) mplayer$(EXESUF): $(CC) -o $@ $^ $(EXTRALIBS) -codec-cfg$(EXESUF): codec-cfg.c help_mp.h +codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $< codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf @@ -865,10 +774,6 @@ config.mak: configure help_mp.h: help/help_mp-en.h $(HELP_FILE) help/help_create.sh $(HELP_FILE) $(CHARSET) -# rebuild version.h each time the working copy is updated -ifeq ($(wildcard .svn/entries),.svn/entries) -version.h: .svn/entries -endif version.h: version.sh ./$< `$(CC) -dumpversion` @@ -881,7 +786,18 @@ version.h: version.sh # Make sure all generated header files are created. codec-cfg.d codec-cfg.o: codecs.conf.h $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h -$(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi gui/win32/gui): version.h +$(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi): version.h + +# Files that depend on libswscale internals +libvo/vo_mga.o libvo/vo_xmga.o libmpcodecs/vf_halfpack.o libmpcodecs/vf_palette.o libmpcodecs/vf_rgb2bgr.o libmpcodecs/vf_yuy2.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS) + +# Files that depend on libavcodec internals +libaf/af_lavcac3enc.o libmpcodecs/vf_fspp.o libmpcodecs/vf_geq.o libmpcodecs/vf_mcdeint.o libmpcodecs/vf_qp.o libmpcodecs/vf_spp.o libvo/jpeg_enc.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS) + +# yuv4mpeg has rgb conversion code under #ifdef CONFIG_LIBSWSCALE_INTERNALS +ifeq ($(LIBSWSCALE_INTERNALS),yes) +libvo/vo_yuv4mpeg.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS) +endif libdvdcss/%: CFLAGS := -Ilibdvdcss -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS) libdvdnav/%: CFLAGS := -Ilibdvdnav -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS) @@ -918,36 +834,23 @@ $(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI_FILES) install: $(INSTALL_TARGETS-yes) install-dirs: - $(INSTALL) -d $(BINDIR) $(CONFDIR) $(LIBDIR) + if test ! -d $(BINDIR) ; then $(INSTALL) -d $(BINDIR) ; fi + if test ! -d $(CONFDIR) ; then $(INSTALL) -d $(CONFDIR) ; fi + if test ! -d $(LIBDIR) ; then $(INSTALL) -d $(LIBDIR) ; fi install-%: %$(EXESUF) install-dirs $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) -install-gui: install-mplayer - -ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF) - $(INSTALL) -d $(DATADIR)/skins $(prefix)/share/pixmaps $(prefix)/share/applications - $(INSTALL) -m 644 etc/mplayer.xpm $(prefix)/share/pixmaps/ - $(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/ - -install-gui-man: $(foreach lang,$(MAN_LANGS),install-gui-man-$(lang)) install-mencoder-man: $(foreach lang,$(MAN_LANGS),install-mencoder-man-$(lang)) install-mplayer-man: $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang)) -install-gui-man-en: install-mplayer-man-en - cd $(MANDIR)/man1/ && ln -sf mplayer.1 gmplayer.1 - install-mencoder-man-en: install-mplayer-man-en cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 install-mplayer-man-en: - $(INSTALL) -d $(MANDIR)/man1 + if test ! -d $(MANDIR)/man1 ; then $(INSTALL) -d $(MANDIR)/man1 ; fi $(INSTALL) -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/ -define GUI_MAN_RULE -install-gui-man-$(lang): install-mplayer-man-$(lang) - cd $(MANDIR)/$(lang)/man1/ && ln -sf mplayer.1 gmplayer.1 -endef - define MENCODER_MAN_RULE install-mencoder-man-$(lang): install-mplayer-man-$(lang) cd $(MANDIR)/$(lang)/man1 && ln -sf mplayer.1 mencoder.1 @@ -955,11 +858,10 @@ endef define MPLAYER_MAN_RULE install-mplayer-man-$(lang): - $(INSTALL) -d $(MANDIR)/$(lang)/man1 + if test ! -d $(MANDIR)/$(lang)/man1 ; then $(INSTALL) -d $(MANDIR)/$(lang)/man1 ; fi $(INSTALL) -m 644 DOCS/man/$(lang)/mplayer.1 $(MANDIR)/$(lang)/man1/ endef -$(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(GUI_MAN_RULE))) $(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MENCODER_MAN_RULE))) $(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MPLAYER_MAN_RULE))) |