On date Wednesday 2011-07-13 18:18:07 +0100, Mans Rullgard encoded: > 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 <[email protected]> > --- > Makefile | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/Makefile b/Makefile > index a27fe28..9d6ec3a 100644 > --- a/Makefile > +++ b/Makefile > @@ -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 > --
LGTM, thanks. _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
