From cf53c48615658a6019ffb7e8453913bbfd38cb27 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Sun, 5 Jun 2011 22:18:06 +0100 Subject: [PATCH] build: move ALLFFLIBS to a more logical place Signed-off-by: Mans Rullgard --- Makefile | 2 ++ common.mak | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) 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 diff --git a/common.mak b/common.mak index b5ccadbe6e..324868762a 100644 --- a/common.mak +++ b/common.mak @@ -25,8 +25,6 @@ $(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR)))) $(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_DIR)/%=%)); $(INSTALL)) endif -ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale - IFLAGS := -I. -I$(SRC_PATH) CPPFLAGS := $(IFLAGS) $(CPPFLAGS) CFLAGS += $(ECFLAGS)