diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 80 |
1 files changed, 43 insertions, 37 deletions
@@ -36,6 +36,7 @@ LDFLAGS_MENCODER = $(EXTRALIBS_MENCODER) \ SRCS_COMMON = asxparser.c \ codec-cfg.c \ cpudetect.c \ + defaultopts.c \ edl.c \ find_sub.c \ get_path.c \ @@ -50,6 +51,7 @@ SRCS_COMMON = asxparser.c \ sub_cc.c \ subopt-helper.c \ subreader.c \ + talloc.c \ vobsub.c \ libaf/af.c \ libaf/af_center.c \ @@ -515,6 +517,7 @@ SRCS_MPLAYER = mplayer.c \ libao2/ao_pcm.c \ libvo/aspect.c \ libvo/geometry.c \ + libvo/old_vo_wrapper.c \ libvo/spuenc.c \ libvo/video_out.c \ libvo/vo_mpegpes.c \ @@ -685,10 +688,10 @@ SRCS_COMMON += $(SRCS_COMMON-yes) $(SRCS_COMMON-yes-yes) $(SRCS_COMMON-yes-yes SRCS_MENCODER += $(SRCS_MENCODER-yes) SRCS_MPLAYER += $(SRCS_MPLAYER-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) @@ -721,17 +724,17 @@ DIRS = . \ libaf \ libao2 \ libass \ - libavcodec \ - libavcodec/alpha \ - libavcodec/arm \ - libavcodec/bfin \ - libavcodec/mlib \ - libavcodec/ppc \ - libavcodec/sh4 \ - libavcodec/sparc \ - libavcodec/x86 \ - libavformat \ - libavutil \ + 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 \ libdvdcss \ libdvdread \ libfaad2 \ @@ -740,7 +743,7 @@ DIRS = . \ libmpcodecs/native \ libmpdemux \ libmpeg2 \ - libpostproc \ + ffmpeg/libpostproc \ libswscale \ libvo \ loader \ @@ -758,14 +761,14 @@ DIRS = . \ ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h)) -PARTS = libavcodec \ - libavformat \ - libavutil \ - libpostproc \ +PARTS = ffmpeg/libavcodec \ + ffmpeg/libavformat \ + ffmpeg/libavutil \ + ffmpeg/libpostproc \ libswscale \ -FFMPEGLIBS = $(foreach part, $(PARTS), $(part)/$(part).a) -FFMPEGFILES = $(foreach part, $(PARTS), $(part)/*.[chS] libavcodec/*/*.[chS]) +FFMPEGLIBS = $(foreach part, $(PARTS), $(part)/$(notdir $(part)).a) +FFMPEGFILES = $(foreach part, $(PARTS), $(part)/*.[choS]) ffmpeg/libavcodec/*/*.[choS] ffmpeg/libavcodec/*/*.asm @@ -773,21 +776,18 @@ FFMPEGFILES = $(foreach part, $(PARTS), $(part)/*.[chS] libavcodec/*/*.[chS]) 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. $< $@ @@ -796,6 +796,10 @@ checkheaders: $(ALLHEADERS:.h=.ho) dep depend: $(DEPS) for part in $(PARTS); 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 $@ @@ -807,7 +811,7 @@ mplayer$(EXESUF): $(MPLAYER_DEPS) $(CC) -o $@ $^ $(LDFLAGS_MPLAYER) codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h - $(HOST_CC) -O -DCODECS2HTML $(EXTRA_INC) -o $@ $< + $(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $< codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf ./$^ > $@ @@ -834,8 +838,8 @@ version.h: ###### dependency declarations / specific CFLAGS ###### -codec-cfg.d: codecs.conf.h -mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h +codec-cfg.o: codecs.conf.h +mencoder.o mplayer.o vobsub.o gui/win32/gui.o libmpdemux/muxer_avi.o osdep/mplayer-rc.o stream/network.o stream/stream_cddb.o: version.h $(DEPS): help_mp.h libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS) @@ -870,7 +874,9 @@ $(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) @@ -888,7 +894,7 @@ 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) -c -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/ define MENCODER_MAN_RULE @@ -898,7 +904,7 @@ 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) -c -m 644 DOCS/man/$(lang)/mplayer.1 $(MANDIR)/$(lang)/man1/ endef |