[FFmpeg-cvslog] build: move ALLFFLIBS to a more logical place
Mans Rullgard
git at videolan.org
Wed Jun 15 02:23:09 CEST 2011
ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Sun Jun 5 22:18:06 2011 +0100| [cf53c48615658a6019ffb7e8453913bbfd38cb27] | committer: Mans Rullgard
build: move ALLFFLIBS to a more logical place
Signed-off-by: Mans Rullgard <mans at mansr.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf53c48615658a6019ffb7e8453913bbfd38cb27
---
Makefile | 2 ++
common.mak | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 0df8a11..ca07d9f 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 b5ccadb..3248687 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)
More information about the ffmpeg-cvslog
mailing list