cosmetics: Move around some rules and variable declarations.

This is in preparation for common.mak inclusion in the main Makefile.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12596 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/Makefile b/Makefile
index 34f43e7945891df115141901de46b510f8282678..499dcd14640fdab7092b66c058c8c6cda9ef574a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,7 @@ PROGS-$(CONFIG_FFSERVER) += ffserver
 
 PROGS       = $(addsuffix   $(EXESUF), $(PROGS-yes))
 PROGS_G     = $(addsuffix _g$(EXESUF), $(PROGS-yes))
+SRCS        = $(addsuffix .c,          $(PROGS-yes)) cmdutils.c
 MANPAGES    = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes)))
 
 BASENAMES   = ffmpeg ffplay ffserver
@@ -44,6 +45,15 @@ INSTALL_TARGETS-yes             += install-progs
 INSTALL_TARGETS-$(BUILD_DOC)    += install-man
 endif
 
+main: lib $(PROGS_G) $(PROGS) $(ALL_TARGETS-yes)
+
+%$(EXESUF): %_g$(EXESUF)
+       cp -p $< $@
+       $(STRIP) $@
+
+vhook/%.o: vhook/%.c
+       $(CC) $(VHOOKCFLAGS) -c -o $@ $<
+
 VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
 
 BASEHOOKS = fish null watermark
@@ -64,7 +74,6 @@ LIBS_drawtext$(SLIBSUF)        = `freetype-config --libs`
 
 VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
 
-SRCS = $(addsuffix .c, $(PROGS-yes)) cmdutils.c
 LDFLAGS := -L$(BUILD_ROOT)/libavdevice -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
 EXTRALIBS := -lavdevice$(BUILDSUF) -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
 
@@ -81,8 +90,6 @@ endif
 MAKE-yes = $(MAKE)
 MAKE-    = : $(MAKE)
 
-main: lib $(PROGS_G) $(PROGS) $(ALL_TARGETS-yes)
-
 lib:
        $(MAKE)                    -C libavutil   all
        $(MAKE)                    -C libavcodec  all
@@ -98,10 +105,6 @@ ffserver_g$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS)
 %_g$(EXESUF): %.o cmdutils.o .libs
        $(CC) $(LDFLAGS) -o $@ $< cmdutils.o $(EXTRALIBS)
 
-%$(EXESUF): %_g$(EXESUF)
-       cp -p $< $@
-       $(STRIP) $@
-
 SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries
 ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES))
 version.h: $(SVN_ENTRIES)
@@ -126,9 +129,6 @@ videohook: .libs $(HOOKS)
 vhook/%$(SLIBSUF): vhook/%.o
        $(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F))
 
-vhook/%.o: vhook/%.c
-       $(CC) $(VHOOKCFLAGS) -c -o $@ $<
-
 %.o: %.c
        $(CC) $(CFLAGS) -c -o $@ $<