aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-06-05 22:18:06 +0100
committerMans Rullgard <mans@mansr.com>2011-06-14 10:59:56 +0100
commitcf53c48615658a6019ffb7e8453913bbfd38cb27 (patch)
tree057130de0be170f00e82a862197730642e921344
parente897a633cded0a8f283114e22766790f48ae8fa7 (diff)
downloadffmpeg-cf53c48615658a6019ffb7e8453913bbfd38cb27.tar.gz
build: move ALLFFLIBS to a more logical place
Signed-off-by: Mans Rullgard <mans@mansr.com>
-rw-r--r--Makefile2
-rw-r--r--common.mak2
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)