diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-27 11:19:35 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-27 11:19:35 +0000 |
| commit | d3ff5799f90f613f2b428064dfb039855b160e34 (patch) | |
| tree | e4e866c15625bf43cc30783b4b4f293ab47bd661 /Makefile | |
| parent | a10452836d06f87e4a58a11de18379609b3310d7 (diff) | |
| download | mpv-d3ff5799f90f613f2b428064dfb039855b160e34.tar.bz2 mpv-d3ff5799f90f613f2b428064dfb039855b160e34.tar.xz | |
cosmetics: Move some rules to better places.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26887 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -736,25 +736,12 @@ 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 > $@ -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 @@ ifneq ($(CHARSET),UTF-8) 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 @@ tags: 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) |