This variable is set to the same value for all directories. Adding the -L flags directly to LDFLAGS is simpler and achieves the same thing.
Signed-off-by: Mans Rullgard <[email protected]> --- Makefile | 6 +++--- common.mak | 1 - subdir.mak | 4 ++-- tests/Makefile | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 720936a..87451e0 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,7 @@ CFLAGS += $(ECFLAGS) CCFLAGS = $(CFLAGS) YASMFLAGS += $(IFLAGS) -Pconfig.asm HOSTCFLAGS += $(IFLAGS) +LDFLAGS += $(ALLFFLIBS:%=-Llib%) define COMPILE $($(1)DEP) @@ -82,7 +83,6 @@ SKIPHEADERS = cmdutils_common_opts.h include $(SRC_PATH)/common.mak -FF_LDFLAGS := $(FFLDFLAGS) FF_EXTRALIBS := $(FFEXTRALIBS) FF_DEP_LIBS := $(DEP_LIBS) @@ -118,10 +118,10 @@ $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D)))) ffplay.o: CFLAGS += $(SDL_CFLAGS) ffplay$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS) -ffserver$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS) +ffserver$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS) $(PROGS): %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS) - $(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS) + $(LD) $(LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS) OBJDIRS += tools diff --git a/common.mak b/common.mak index 8a2aa7c..d781ced 100644 --- a/common.mak +++ b/common.mak @@ -12,7 +12,6 @@ FFLIBS := $(FFLIBS-yes) $(FFLIBS) TESTPROGS += $(TESTPROGS-yes) FFEXTRALIBS := $(FFLIBS:%=-l%$(BUILDSUF)) $(EXTRALIBS) -FFLDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS) EXAMPLES := $(EXAMPLES:%=$(SUBDIR)%-example$(EXESUF)) OBJS := $(sort $(OBJS:%=$(SUBDIR)%)) diff --git a/subdir.mak b/subdir.mak index a88955b..e6d5295 100644 --- a/subdir.mak +++ b/subdir.mak @@ -35,14 +35,14 @@ install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared define RULES $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o - $$(LD) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS) + $$(LD) $(LDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS) $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME) $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver $(DEP_LIBS) $(SLIB_CREATE_DEF_CMD) - $$(LD) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS) + $$(LD) $(SHFLAGS) $(LDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS) $(SLIB_EXTRA_CMD) clean:: diff --git a/tests/Makefile b/tests/Makefile index 501a72f..35e803d 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -29,7 +29,7 @@ tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF) tests/data/asynth1.sw tests/vsynth%/00.pgm: TAG = GEN tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS) - $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) + $(LD) $(LDFLAGS) -o $@ $< $(FF_EXTRALIBS) include $(SRC_PATH)/tests/fate.mak include $(SRC_PATH)/tests/fate2.mak -- 1.7.6 _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
