Mercurial > mplayer.hg
changeset 26855:a8a0d256c7fc
cosmetics: Move some rules to better places.
| author | diego |
|---|---|
| date | Tue, 27 May 2008 11:19:35 +0000 |
| parents | eb5b4fe783a0 |
| children | 05d19389ba59 |
| files | Makefile |
| diffstat | 1 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Tue May 27 11:14:24 2008 +0000 +++ b/Makefile Tue May 27 11:19:35 2008 +0000 @@ -736,25 +736,12 @@ codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf ./codec-cfg$(EXESUF) ./etc/codecs.conf > $@ -codecs2html$(EXESUF): mp_msg-mencoder.o - $(CC) -I. -DCODECS2HTML codec-cfg.c $^ -o $@ - -osdep/mplayer-rc.o: osdep/mplayer.rc version.h - $(WINDRES) -I. -o $@ $< - # ./configure must be rerun if it changed config.mak: configure @echo "############################################################" @echo "####### Please run ./configure again - it's changed! #######" @echo "############################################################" -# 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` - help_mp.h: help/help_mp-en.h $(HELP_FILE) @echo '// WARNING! This is a generated file. Do NOT edit.' > $@ @echo '// See the help/ subdir for the editable files.' >> $@ @@ -768,6 +755,16 @@ iconv -f UTF-8 -t $(CHARSET) $@ > $@.tmp; mv $@.tmp $@ endif +# 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` + +osdep/mplayer-rc.o: osdep/mplayer.rc version.h + $(WINDRES) -I. -o $@ $< + ###### dependency declarations / specific CFLAGS ###### @@ -878,6 +875,9 @@ TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm +codecs2html$(EXESUF): mp_msg-mencoder.o + $(CC) -I. -DCODECS2HTML codec-cfg.c $^ -o $@ + codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h codec-cfg.h $(TEST_OBJS) $(CC) -I. -DTESTING -o $@ $< $(TEST_OBJS)