From cf53c48615658a6019ffb7e8453913bbfd38cb27 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Sun, 5 Jun 2011 22:18:06 +0100 Subject: build: move ALLFFLIBS to a more logical place Signed-off-by: Mans Rullgard --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0df8a11407..ca07d9fe6d 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,8 @@ BASENAMES = ffmpeg ffplay ffprobe ffserver ALLPROGS = $(BASENAMES:%=%$(EXESUF)) ALLMANPAGES = $(BASENAMES:%=%.1) +ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale + FFLIBS-$(CONFIG_AVDEVICE) += avdevice FFLIBS-$(CONFIG_AVFILTER) += avfilter FFLIBS-$(CONFIG_AVFORMAT) += avformat -- cgit v1.2.3 From d530e5794475887d5d2b1f05dfd60ba4542b0f82 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Sun, 5 Jun 2011 22:00:54 +0100 Subject: build: move vpath directives to main Makefile Signed-off-by: Mans Rullgard --- Makefile | 5 +++++ common.mak | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ca07d9fe6d..084e175b90 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 324868762a..e9e69f263b 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 = @ -- cgit v1.2.3