[FFmpeg-cvslog] build: move vpath directives to main Makefile

[Mans Rullgard]

ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Sun Jun  5 22:00:54 2011 +0100| [d530e5794475887d5d2b1f05dfd60ba4542b0f82] | committer: Mans Rullgard

build: move vpath directives to main Makefile

Signed-off-by: Mans Rullgard <mans at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d530e5794475887d5d2b1f05dfd60ba4542b0f82
---

 Makefile   |    5 +++++
 common.mak |    5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index ca07d9f..084e175 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,11 @@ include config.mak
 
 SRC_DIR = $(SRC_PATH_BARE)
 
+vpath %.c   $(SRC_DIR)
+vpath %.h   $(SRC_DIR)
+vpath %.S   $(SRC_DIR)
+vpath %.asm $(SRC_DIR)
+vpath %.v   $(SRC_DIR)
 vpath %.texi $(SRC_PATH_BARE)
 
 PROGS-$(CONFIG_FFMPEG)   += ffmpeg
diff --git a/common.mak b/common.mak
index 3248687..e9e69f2 100644
--- a/common.mak
+++ b/common.mak
@@ -6,11 +6,6 @@
 all: all-yes
 
 ifndef SUBDIR
-vpath %.c   $(SRC_DIR)
-vpath %.h   $(SRC_DIR)
-vpath %.S   $(SRC_DIR)
-vpath %.asm $(SRC_DIR)
-vpath %.v   $(SRC_DIR)
 
 ifndef V
 Q      = @