[MPlayer-cvslog] r26887 - trunk/Makefile

[diego]

Author: diego
Date: Tue May 27 13:19:35 2008
New Revision: 26887

Log:
cosmetics: Move some rules to better places.


Modified:
   trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Tue May 27 13:19:35 2008
@@ -736,25 +736,12 @@ codec-cfg$(EXESUF): codec-cfg.c codec-cf
 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)