diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 150 |
1 files changed, 50 insertions, 100 deletions
@@ -334,6 +334,7 @@ SRCS_COMMON-$(ZR) += libmpcodecs/vd_zrmjpeg.c \ SRCS_COMMON = asxparser.c \ codec-cfg.c \ cpudetect.c \ + defaultopts.c \ edl.c \ find_sub.c \ fmt-conversion.c \ @@ -349,6 +350,7 @@ SRCS_COMMON = asxparser.c \ sub_cc.c \ subopt-helper.c \ subreader.c \ + talloc.c \ vobsub.c \ libaf/af.c \ libaf/af_center.c \ @@ -510,6 +512,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 \ @@ -548,41 +551,6 @@ SRCS_MPLAYER-$(GGI) += libvo/vo_ggi.c SRCS_MPLAYER-$(GIF) += libvo/vo_gif89a.c SRCS_MPLAYER-$(GL) += libvo/gl_common.c libvo/vo_gl.c libvo/vo_gl2.c SRCS_MPLAYER-$(GL_WIN32) += libvo/w32_common.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 @@ -673,6 +641,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 \ @@ -709,10 +678,10 @@ SRCS_MENCODER = mencoder.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-$(LIBAVFORMAT_A) += ffmpeg/libavformat/libavformat.a +COMMON_LIBS-$(LIBAVCODEC_A) += ffmpeg/libavcodec/libavcodec.a +COMMON_LIBS-$(LIBAVUTIL_A) += ffmpeg/libavutil/libavutil.a +COMMON_LIBS-$(LIBPOSTPROC_A) += ffmpeg/libpostproc/libpostproc.a COMMON_LIBS-$(LIBSWSCALE_A) += libswscale/libswscale.a COMMON_LIBS += $(COMMON_LIBS-yes) @@ -729,38 +698,32 @@ 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 \ + ffmpeg/libavcodec \ + ffmpeg/libavcodec/alpha \ + ffmpeg/libavcodec/arm \ + ffmpeg/libavcodec/bfin \ + ffmpeg/libavcodec/x86 \ + ffmpeg/libavcodec/mlib \ + ffmpeg/libavcodec/ppc \ + ffmpeg/libavcodec/sh4 \ + ffmpeg/libavcodec/sparc \ + ffmpeg/libavformat \ + ffmpeg/libavutil \ + ffmpeg/libavutil/arm \ + ffmpeg/libavutil/bfin \ + ffmpeg/libavutil/bfin \ + ffmpeg/libavutil/ppc \ + ffmpeg/libavutil/sh4 \ + ffmpeg/libavutil/x86 \ libdvdcss \ libdvdnav \ libdvdnav/vm \ @@ -771,7 +734,7 @@ DIRS = . \ libmpcodecs/native \ libmpdemux \ libmpeg2 \ - libpostproc \ + ffmpeg/libpostproc \ libswscale \ libswscale/bfin \ libswscale/mlib \ @@ -798,14 +761,14 @@ 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 \ +FFMPEGPARTS = ffmpeg/libavcodec \ + ffmpeg/libavformat \ + ffmpeg/libavutil \ + ffmpeg/libpostproc \ libswscale \ -FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), $(part)/$(part).a) -FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(wildcard $(part)/*.[chS] $(part)/*/*.[chS])) +FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), $(part)/$(notdir $(part)).a) +FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(wildcard $(part)/*.[choS] $(part)/*/*.[choS] $(part)/*/*.asm)) @@ -813,21 +776,18 @@ FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(wildcard $(part)/*.[chS] $(part) 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. $< $@ @@ -836,6 +796,10 @@ checkheaders: $(ALLHEADERS:.h=.ho) dep depend: $(DEPS) for part in $(FFMPEGPARTS); do $(MAKE) -C $$part depend; done +# dummy to prevent default build rules from being used for FFMPEGFILES +$(FFMPEGFILES): + echo "this shouldn't run" + $(FFMPEGLIBS): $(FFMPEGFILES) config.h $(MAKE) -C $(@D) touch $@ @@ -846,8 +810,8 @@ mencoder$(EXESUF): $(MENCODER_DEPS) mplayer$(EXESUF): $(MPLAYER_DEPS) $(CC) -o $@ $^ $(LDFLAGS_MPLAYER) -codec-cfg$(EXESUF): codec-cfg.c help_mp.h - $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $< +codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h + $(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $< codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf ./$^ > $@ @@ -877,7 +841,7 @@ 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 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) @@ -914,36 +878,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 @@ -951,11 +902,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))) |