diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-07-13 18:17:54 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-07-21 12:50:31 +0100 |
| commit | 371584c42bffa21991a0e0d97a03f6d42123ba1f (patch) | |
| tree | 8646326af9ff1f33f89a6020d702258748a7dcd4 | |
| parent | 2cc4f3b21f33740db1728bae104f336e7008731c (diff) | |
| download | ffmpeg-371584c42bffa21991a0e0d97a03f6d42123ba1f.tar.gz | |
build: add -L flags before existing LDFLAGS
This ensures the linker picks the just built libraries even
if LDFLAGS for some reason contains -L flags pointing at
other directories containing libav libraries.
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -20,13 +20,15 @@ $(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR)))) $(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_PATH)/%=%)); $(INSTALL)) endif +ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale + IFLAGS := -I. -I$(SRC_PATH) CPPFLAGS := $(IFLAGS) $(CPPFLAGS) CFLAGS += $(ECFLAGS) CCFLAGS = $(CFLAGS) YASMFLAGS += $(IFLAGS) -Pconfig.asm HOSTCFLAGS += $(IFLAGS) -LDFLAGS += $(ALLFFLIBS:%=-Llib%) +LDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS) define COMPILE $($(1)DEP) @@ -66,8 +68,6 @@ 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 |