diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-30 05:56:50 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-30 06:09:04 +0300 |
commit | 431bf1f5b647ba61103c6a2573fb9472f0aa6122 (patch) | |
tree | 81d72428f559ce537cc6484330bb8011801c9c7b /Makefile | |
parent | 4237cb821b9eb5b28f1d14963563077e55225396 (diff) | |
parent | 2e30b5c260c5378afc714e9599d6e763755b717a (diff) | |
download | mpv-431bf1f5b647ba61103c6a2573fb9472f0aa6122.tar.bz2 mpv-431bf1f5b647ba61103c6a2573fb9472f0aa6122.tar.xz |
Merge svn changes up to r26599
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 101 |
1 files changed, 68 insertions, 33 deletions
@@ -631,6 +631,14 @@ ALL_PRG += $(ALL_PRG-yes) MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS) MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS) +SRCS_COMMON += $(SRCS_COMMON-yes) $(SRCS_COMMON-yes-yes) $(SRCS_COMMON-yes-yes-yes) +SRCS_MENCODER += $(SRCS_MENCODER-yes) +SRCS_MPLAYER += $(SRCS_MPLAYER-yes) + +OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON)) ) +OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER)) ) +OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER)) ) + INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man INSTALL_TARGETS-$(GUI) += install-gui @@ -655,6 +663,17 @@ DIRS = . \ libaf \ libao2 \ libass \ + ffmpeg/libavcodec \ + ffmpeg/libavcodec/alpha \ + ffmpeg/libavcodec/armv4l \ + ffmpeg/libavcodec/bfin \ + ffmpeg/libavcodec/i386 \ + ffmpeg/libavcodec/mlib \ + ffmpeg/libavcodec/ppc \ + ffmpeg/libavcodec/sh4 \ + ffmpeg/libavcodec/sparc \ + ffmpeg/libavformat \ + ffmpeg/libavutil \ libdvdcss \ libfaad2 \ libmenu \ @@ -662,6 +681,8 @@ DIRS = . \ libmpcodecs/native \ libmpdemux \ libmpeg2 \ + ffmpeg/libpostproc \ + libswscale \ libvo \ loader \ loader/dshow \ @@ -681,13 +702,48 @@ all: $(ALL_PRG) recurse: for part in $(PARTS); do $(MAKE) -C $$part; done -include mpcommon.mak +%.d: %.c + $(MPDEPEND_CMD) > $@ + +%.d: %.cpp + $(MPDEPEND_CMD_CXX) > $@ + +%.d: %.m + $(MPDEPEND_CMD) > $@ + +%.ho: %.h + $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $< + +%.o: %.m + $(CC) $(CFLAGS) -c -o $@ $< DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER)))) $(DEPS) recurse: help_mp.h version.h codecs.conf.h dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part depend; done +# rebuild at every config.h/config.mak change: +version.h: config.h config.mak + ./version.sh `$(CC) -dumpversion` + +help_mp.h: help/help_mp-en.h $(HELP_FILE) + @echo '// WARNING! This is a generated file. Do NOT edit.' > help_mp.h + @echo '// See the help/ subdir for the editable files.' >> help_mp.h + @echo '#ifndef MPLAYER_HELP_MP_H' >> help_mp.h + @echo '#define MPLAYER_HELP_MP_H' >> help_mp.h +ifeq ($(CHARSET),) + @echo '#include "$(HELP_FILE)"' >> help_mp.h +else + iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h +endif + @echo '#endif /* MPLAYER_HELP_MP_H */' >> help_mp.h + +ifneq ($(HELP_FILE),help/help_mp-en.h) + @echo "Adding untranslated messages to help_mp.h" + @echo '// untranslated messages from the English master file:' >> help_mp.h + @help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> help_mp.h +endif + define RECURSIVE_RULE $(part)/$(notdir $(part)).a: $(MAKE) -C $(part) @@ -709,8 +765,6 @@ codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf ./codec-cfg$(EXESUF) ./etc/codecs.conf > $@ -codec-cfg.o: codecs.conf.h - codecs2html$(EXESUF): mp_msg.o $(CC) -DCODECS2HTML codec-cfg.c $^ -o $@ @@ -814,16 +868,15 @@ uninstall: done clean: toolsclean - for part in $(PARTS); do $(MAKE) -C $$part clean; done - rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.ho /*~, $(addsuffix $(suffix),$(dir)))) - rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \ - codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \ - codecs.conf.h help_mp.h version.h TAGS tags $(VIDIX_PCI_FILES) + rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.a /*.ho /*~, $(addsuffix $(suffix),$(dir)))) + rm -f mplayer$(EXESUF) mencoder$(EXESUF) distclean: clean doxygen_clean - for part in $(PARTS); do $(MAKE) -C $$part distclean; done rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir)))) - rm -f configure.log config.mak config.h + rm -f configure.log config.mak config.h codecs.conf.h help_mp.h \ + version.h $(VIDIX_PCI_FILES) \ + codec-cfg$(EXESUF) codecs2html$(EXESUF) codec-cfg-test$(EXESUF) \ + cpuinfo$(EXESUF) TAGS tags strip: strip -s $(ALL_PRG) @@ -834,40 +887,21 @@ TAGS: tags: rm -f $@; ( find -name '*.[chS]' -print ) | xargs ctags -a +ALLHEADERS = $(wildcard *.h) +checkheaders: $(ALLHEADERS:.h=.ho) + # ./configure must be rerun if it changed config.mak: configure @echo "############################################################" @echo "####### Please run ./configure again - it's changed! #######" @echo "############################################################" -# rebuild at every config.h/config.mak/Makefile change: -version.h: config.h config.mak Makefile - ./version.sh `$(CC) -dumpversion` - doxygen: doxygen DOCS/tech/Doxyfile doxygen_clean: -rm -rf DOCS/tech/doxygen -help_mp.h: help/help_mp-en.h $(HELP_FILE) - @echo '// WARNING! This is a generated file. Do NOT edit.' > help_mp.h - @echo '// See the help/ subdir for the editable files.' >> help_mp.h - @echo '#ifndef MPLAYER_HELP_MP_H' >> help_mp.h - @echo '#define MPLAYER_HELP_MP_H' >> help_mp.h -ifeq ($(CHARSET),) - @echo '#include "$(HELP_FILE)"' >> help_mp.h -else - iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h -endif - @echo '#endif /* MPLAYER_HELP_MP_H */' >> help_mp.h - -ifneq ($(HELP_FILE),help/help_mp-en.h) - @echo "Adding untranslated messages to help_mp.h" - @echo '// untranslated messages from the English master file:' >> help_mp.h - @help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> help_mp.h -endif - TOOLS = TOOLS/alaw-gen$(EXESUF) \ TOOLS/asfinfo$(EXESUF) \ @@ -891,7 +925,7 @@ ALLTOOLS = $(TOOLS) \ tools: $(TOOLS) alltools: $(ALLTOOLS) -TOOLS_COMMON_LIBS = mp_msg.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) \ +TOOLS_COMMON_LIBS = mp_msg-mencoder.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) \ -ltermcap -lm TOOLS/bmovl-test$(EXESUF): TOOLS/bmovl-test.c -lSDL_image @@ -940,3 +974,4 @@ toolsclean: -include $(DEPS) .PHONY: all doxygen *install* recurse strip *tools +.PHONY: checkheaders *clean dep depend |