Mercurial > mplayer.hg
comparison Makefile @ 32313:ad6178f15dd1
Use a single svn:externals declaration for all of FFmpeg.
This avoids duplicating parts of the FFmpeg build system locally,
which is a brittle and maintenance-heavy process.
author | diego |
---|---|
date | Tue, 28 Sep 2010 20:46:19 +0000 |
parents | 563b35a003b8 |
children | d7de0c0de45c |
comparison
equal
deleted
inserted
replaced
32312:362540be208e | 32313:ad6178f15dd1 |
---|---|
715 libmpdemux/muxer_rawaudio.c \ | 715 libmpdemux/muxer_rawaudio.c \ |
716 libmpdemux/muxer_rawvideo.c \ | 716 libmpdemux/muxer_rawvideo.c \ |
717 $(SRCS_MENCODER-yes) | 717 $(SRCS_MENCODER-yes) |
718 | 718 |
719 | 719 |
720 COMMON_LIBS-$(FFMPEG_A) += libavformat/libavformat.a \ | 720 COMMON_LIBS-$(FFMPEG_A) += ffmpeg/libavformat/libavformat.a \ |
721 libavcodec/libavcodec.a \ | 721 ffmpeg/libavcodec/libavcodec.a \ |
722 libavcore/libavcore.a \ | 722 ffmpeg/libavcore/libavcore.a \ |
723 libavutil/libavutil.a \ | 723 ffmpeg/libavutil/libavutil.a \ |
724 libpostproc/libpostproc.a \ | 724 ffmpeg/libpostproc/libpostproc.a \ |
725 libswscale/libswscale.a | 725 ffmpeg/libswscale/libswscale.a |
726 COMMON_LIBS += $(COMMON_LIBS-yes) | 726 COMMON_LIBS += $(COMMON_LIBS-yes) |
727 | 727 |
728 OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON))) | 728 OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON))) |
729 OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER))) | 729 OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER))) |
730 OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER))) | 730 OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER))) |
752 gui/win32 \ | 752 gui/win32 \ |
753 input \ | 753 input \ |
754 libaf \ | 754 libaf \ |
755 libao2 \ | 755 libao2 \ |
756 libass \ | 756 libass \ |
757 libavcodec \ | 757 ffmpeg/libavcodec \ |
758 libavcodec/alpha \ | 758 ffmpeg/libavcodec/alpha \ |
759 libavcodec/arm \ | 759 ffmpeg/libavcodec/arm \ |
760 libavcodec/bfin \ | 760 ffmpeg/libavcodec/bfin \ |
761 libavcodec/mlib \ | 761 ffmpeg/libavcodec/mlib \ |
762 libavcodec/ppc \ | 762 ffmpeg/libavcodec/ppc \ |
763 libavcodec/sh4 \ | 763 ffmpeg/libavcodec/sh4 \ |
764 libavcodec/sparc \ | 764 ffmpeg/libavcodec/sparc \ |
765 libavcodec/x86 \ | 765 ffmpeg/libavcodec/x86 \ |
766 libavcore \ | 766 ffmpeg/libavcore \ |
767 libavformat \ | 767 ffmpeg/libavformat \ |
768 libavutil \ | 768 ffmpeg/libavutil \ |
769 libavutil/arm \ | 769 ffmpeg/libavutil/arm \ |
770 libavutil/bfin \ | 770 ffmpeg/libavutil/bfin \ |
771 libavutil/ppc \ | 771 ffmpeg/libavutil/ppc \ |
772 libavutil/sh4 \ | 772 ffmpeg/libavutil/sh4 \ |
773 libavutil/tomi \ | 773 ffmpeg/libavutil/tomi \ |
774 libavutil/x86 \ | 774 ffmpeg/libavutil/x86 \ |
775 libdvdcss \ | 775 libdvdcss \ |
776 libdvdnav \ | 776 libdvdnav \ |
777 libdvdnav/vm \ | 777 libdvdnav/vm \ |
778 libdvdread4 \ | 778 libdvdread4 \ |
779 libfaad2 \ | 779 libfaad2 \ |
781 libmpcodecs \ | 781 libmpcodecs \ |
782 libmpcodecs/native \ | 782 libmpcodecs/native \ |
783 libmpdemux \ | 783 libmpdemux \ |
784 libmpeg2 \ | 784 libmpeg2 \ |
785 libpostproc \ | 785 libpostproc \ |
786 libswscale \ | 786 ffmpeg/libswscale \ |
787 libswscale/bfin \ | 787 ffmpeg/libswscale/bfin \ |
788 libswscale/mlib \ | 788 ffmpeg/libswscale/mlib \ |
789 libswscale/ppc \ | 789 ffmpeg/libswscale/ppc \ |
790 libswscale/sparc \ | 790 ffmpeg/libswscale/sparc \ |
791 libswscale/x86 \ | 791 ffmpeg/libswscale/x86 \ |
792 libvo \ | 792 libvo \ |
793 loader \ | 793 loader \ |
794 loader/dshow \ | 794 loader/dshow \ |
795 loader/dmo \ | 795 loader/dmo \ |
796 loader/wine \ | 796 loader/wine \ |
815 libavformat \ | 815 libavformat \ |
816 libavutil \ | 816 libavutil \ |
817 libpostproc \ | 817 libpostproc \ |
818 libswscale \ | 818 libswscale \ |
819 | 819 |
820 FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), $(part)/$(part).a) | 820 FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), ffmpeg/$(part)/$(part).a) |
821 FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(wildcard $(part)/*.[chS] $(part)/*/*.[chS])) | 821 FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(wildcard ffmpeg/$(part)/*.[chS] ffmpeg/$(part)/*/*.[chS])) |
822 | 822 |
823 | 823 |
824 | 824 |
825 ###### generic rules ####### | 825 ###### generic rules ####### |
826 | 826 |
851 mplayer$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER) | 851 mplayer$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER) |
852 mencoder$(EXESUF) mplayer$(EXESUF): | 852 mencoder$(EXESUF) mplayer$(EXESUF): |
853 $(CC) -o $@ $^ $(EXTRALIBS) | 853 $(CC) -o $@ $^ $(EXTRALIBS) |
854 | 854 |
855 codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h | 855 codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h |
856 $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $< | 856 $(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $< |
857 | 857 |
858 codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf | 858 codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf |
859 ./$^ > $@ | 859 ./$^ > $@ |
860 | 860 |
861 # ./configure must be rerun if it changed | 861 # ./configure must be rerun if it changed |
988 -rm -f $(call ADD_ALL_EXESUFS,mplayer mencoder) | 988 -rm -f $(call ADD_ALL_EXESUFS,mplayer mencoder) |
989 | 989 |
990 distclean: clean testsclean toolsclean driversclean dhahelperclean | 990 distclean: clean testsclean toolsclean driversclean dhahelperclean |
991 -rm -rf DOCS/tech/doxygen | 991 -rm -rf DOCS/tech/doxygen |
992 -rm -f $(call ADD_ALL_DIRS,/*.d) | 992 -rm -f $(call ADD_ALL_DIRS,/*.d) |
993 -rm -f config.log config.mak config.h codecs.conf.h help_mp.h \ | 993 -rm -f config.* codecs.conf.h help_mp.h version.h TAGS tags |
994 version.h $(VIDIX_PCI_FILES) TAGS tags | 994 -rm -f $(VIDIX_PCI_FILES) |
995 -rm -f $(call ADD_ALL_EXESUFS,codec-cfg cpuinfo) | 995 -rm -f $(call ADD_ALL_EXESUFS,codec-cfg cpuinfo) |
996 -rm -f libavutil/avconfig.h | 996 -rm -f ffmpeg/libavutil/avconfig.h ffmpeg/config.mak |
997 | 997 |
998 doxygen: | 998 doxygen: |
999 doxygen DOCS/tech/Doxyfile | 999 doxygen DOCS/tech/Doxyfile |
1000 | 1000 |
1001 TAGS: | 1001 TAGS: |
1009 ###### tests / tools ####### | 1009 ###### tests / tools ####### |
1010 | 1010 |
1011 TEST_OBJS = mp_msg.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm | 1011 TEST_OBJS = mp_msg.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm |
1012 | 1012 |
1013 codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h help_mp.h $(TEST_OBJS) | 1013 codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h help_mp.h $(TEST_OBJS) |
1014 $(CC) -I. -DTESTING -o $@ $^ | 1014 $(CC) -I. -Iffmpeg -DTESTING -o $@ $^ |
1015 | 1015 |
1016 codecs2html$(EXESUF): codec-cfg.c help_mp.h $(TEST_OBJS) | 1016 codecs2html$(EXESUF): codec-cfg.c help_mp.h $(TEST_OBJS) |
1017 $(CC) -I. -DCODECS2HTML -o $@ $^ | 1017 $(CC) -I. -Iffmpeg -DCODECS2HTML -o $@ $^ |
1018 | 1018 |
1019 libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS) | 1019 libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS) |
1020 | 1020 |
1021 LOADER_TEST_OBJS = $(SRCS_WIN32_EMULATION:.c=.o) $(SRCS_QTX_EMULATION:.S=.o) libavutil/libavutil.a osdep/mmap_anon.o cpudetect.o path.o $(TEST_OBJS) | 1021 LOADER_TEST_OBJS = $(SRCS_WIN32_EMULATION:.c=.o) $(SRCS_QTX_EMULATION:.S=.o) ffmpeg/libavutil/libavutil.a osdep/mmap_anon.o cpudetect.o path.o $(TEST_OBJS) |
1022 | 1022 |
1023 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g | 1023 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g |
1024 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS) | 1024 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS) |
1025 | 1025 |
1026 mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(SRCS_MP3LIB:.c=.o) libvo/aclib.o cpudetect.o $(TEST_OBJS) | 1026 mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(SRCS_MP3LIB:.c=.o) libvo/aclib.o cpudetect.o $(TEST_OBJS) |
1056 -rm -f TOOLS/realcodecs/*.so.6.0 | 1056 -rm -f TOOLS/realcodecs/*.so.6.0 |
1057 | 1057 |
1058 TOOLS/bmovl-test$(EXESUF): -lSDL_image | 1058 TOOLS/bmovl-test$(EXESUF): -lSDL_image |
1059 | 1059 |
1060 TOOLS/subrip$(EXESUF): vobsub.o spudec.o unrar_exec.o libvo/aclib.o \ | 1060 TOOLS/subrip$(EXESUF): vobsub.o spudec.o unrar_exec.o libvo/aclib.o \ |
1061 libswscale/libswscale.a libavutil/libavutil.a $(TEST_OBJS) | 1061 ffmpeg/libswscale/libswscale.a ffmpeg/libavutil/libavutil.a $(TEST_OBJS) |
1062 | 1062 |
1063 TOOLS/vfw2menc$(EXESUF): -lwinmm -lole32 | 1063 TOOLS/vfw2menc$(EXESUF): -lwinmm -lole32 |
1064 | 1064 |
1065 mplayer-nomain.o: mplayer.c | 1065 mplayer-nomain.o: mplayer.c |
1066 $(CC) $(CFLAGS) -DDISABLE_MAIN -c -o $@ $< | 1066 $(CC) $(CFLAGS) -DDISABLE_MAIN -c -o $@ $< |