diff options
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 203 |
1 files changed, 63 insertions, 140 deletions
@@ -108,37 +108,25 @@ SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c osdep/mmap_anon.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) += 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_lavcac3enc.c \ libaf/af_lavcresample.c \ libmpcodecs/ad_ffmpeg.c \ libmpcodecs/vd_ffmpeg.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 \ - libmpcodecs/vf_fspp.c \ +SRCS_COMMON-$(LIBAVCODEC_INTERNALS) += 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 \ @@ -181,6 +169,9 @@ 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_palette.c \ + libmpcodecs/vf_rgb2bgr.c \ + SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \ libmpdemux/demux_rtp_codec.cpp \ @@ -329,14 +320,18 @@ 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 \ + bstr.c \ codec-cfg.c \ cpudetect.c \ + defaultopts.c \ edl.c \ find_sub.c \ fmt-conversion.c \ m_config.c \ m_option.c \ m_struct.c \ + mp_msg.c \ mpcommon.c \ parser-cfg.c \ path.c \ @@ -346,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 \ @@ -438,14 +434,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 \ @@ -509,6 +503,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 \ @@ -551,41 +546,6 @@ SRCS_MPLAYER-$(GL_SDL) += libvo/sdl_common.c 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_menu.c \ - gui/mplayer/gtk/gtk_url.c \ - gui/mplayer/gtk/mb.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 @@ -668,7 +628,6 @@ SRCS_MPLAYER = command.c \ m_property.c \ mixer.c \ mp_fifo.c \ - mp_msg.c \ mplayer.c \ parser-mpcmd.c \ input/input.c \ @@ -678,6 +637,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 \ @@ -700,7 +660,6 @@ SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c SRCS_MENCODER = mencoder.c \ - mp_msg-mencoder.c \ parser-mecmd.c \ xvid_vbr.c \ libmpcodecs/ae.c \ @@ -714,12 +673,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))) @@ -735,38 +688,16 @@ 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 +INSTALL_TARGETS-$(MPLAYER) += install-mplayer \ + install-mplayer-man \ + install-mplayer-msg DIRS = . \ - gui \ - gui/mplayer \ - gui/mplayer/gtk \ - gui/skin \ - gui/wm \ - gui/win32 \ input \ 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/tomi \ - libavutil/x86 \ libdvdcss \ libdvdnav \ libdvdnav/vm \ @@ -777,7 +708,6 @@ DIRS = . \ libmpcodecs/native \ libmpdemux \ libmpeg2 \ - libpostproc \ libswscale \ libswscale/bfin \ libswscale/mlib \ @@ -799,32 +729,23 @@ DIRS = . \ TOOLS \ vidix \ +MOFILES := $(MSG_LANGS:%=locale/%/LC_MESSAGES/mplayer.mo) + ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h)) 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) +all: $(ALL_PRG-yes) locales %.ho: %.h $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $< %.o: %.S - $(CC) $(ASFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< %.o: %.c $(CC) $(CFLAGS) -c -o $@ $< @@ -841,11 +762,6 @@ all: $(ALL_PRG-yes) 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) @@ -854,7 +770,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 $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $< codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf @@ -866,26 +782,35 @@ config.mak: configure @echo "####### Please run ./configure again - it's changed! #######" @echo "############################################################" -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` %(EXESUF): %.c +locales: $(MOFILES) + +locale/%/LC_MESSAGES/mplayer.mo: po/%.po + mkdir -p $(dir $@) + msgfmt -c -o $@ $< + ###### dependency declarations / specific CFLAGS ###### # 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 osdep/mplayer.rc): version.h +$(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi osdep/mplayer.rc): version.h + +# Files that depend on libswscale internals +libvo/vo_mga.o libvo/vo_xmga.o libmpcodecs/vf_palette.o libmpcodecs/vf_rgb2bgr.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS) + +# Files that depend on libavcodec internals +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) @@ -922,36 +847,24 @@ $(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-mplayer-msg: $(foreach lang,$(MSG_LANGS),install-mplayer-msg-$(lang)) 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 @@ -959,14 +872,21 @@ 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))) +define MPLAYER_MSG_RULE +install-mplayer-msg-$(lang): + if test ! -d $(LOCALEDIR)/$(lang)/LC_MESSAGES ; then $(INSTALL) -d $(LOCALEDIR)/$(lang)/LC_MESSAGES ; fi + $(INSTALL) -m 644 locale/$(lang)/LC_MESSAGES/mplayer.mo $(LOCALEDIR)/$(lang)/LC_MESSAGES/ +endef + +$(foreach lang,$(MSG_LANG_ALL),$(eval $(MPLAYER_MSG_RULE))) + uninstall: rm -f $(BINDIR)/mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF) rm -f $(BINDIR)/mencoder$(EXESUF) @@ -975,6 +895,7 @@ uninstall: rm -f $(prefix)/share/applications/mplayer.desktop rm -f $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1 rm -f $(foreach lang,$(MAN_LANGS),$(foreach man,mplayer.1 mencoder.1,$(MANDIR)/$(lang)/man1/$(man))) + rm -f $(foreach lang,$(MSG_LANGS),$(LOCALEDIR)/$(lang)/LC_MESSAGES/mplayer.1) clean: -rm -f $(call ADD_ALL_DIRS,/*.o /*.a /*.ho /*~) @@ -983,7 +904,7 @@ clean: distclean: clean testsclean toolsclean driversclean dhahelperclean dhahelperwinclean -rm -rf DOCS/tech/doxygen -rm -f $(call ADD_ALL_DIRS,/*.d) - -rm -f configure.log config.mak config.h codecs.conf.h help_mp.h \ + -rm -f configure.log config.mak config.h codecs.conf.h \ version.h $(VIDIX_PCI_FILES) TAGS tags -rm -f $(call ADD_ALL_EXESUFS,codec-cfg cpuinfo) @@ -996,16 +917,18 @@ TAGS: tags: rm -f $@; find . -name '*.[chS]' -o -name '*.asm' | xargs ctags -a - +generated_ebml: + TOOLS/matroska.py --generate-header >libmpdemux/ebml_types.h + TOOLS/matroska.py --generate-definitions >libmpdemux/ebml_defs.c ###### tests / tools ####### -TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm +TEST_OBJS = mp_msg.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm -codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h help_mp.h $(TEST_OBJS) +codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h $(TEST_OBJS) $(CC) -I. -DTESTING -o $@ $^ -codecs2html$(EXESUF): codec-cfg.c help_mp.h $(TEST_OBJS) +codecs2html$(EXESUF): codec-cfg.c $(TEST_OBJS) $(CC) -I. -DCODECS2HTML -o $@ $^ libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS) |