diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-07-10 22:01:41 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-07-11 11:39:04 +0100 |
| commit | ca9036155d28ed9f5a1406356316c3fd41e5a400 (patch) | |
| tree | 0d4a450a1356867d86c2605d2dfbf5aeead5d2b9 | |
| parent | d1cf45911935cc4fed9afd3a37d99616d31eb9da (diff) | |
build: remove unnecessary FFLDFLAGS variable
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 <mans@mansr.com>
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | common.mak | 1 | ||||
| -rw-r--r-- | subdir.mak | 4 | ||||
| -rw-r--r-- | tests/Makefile | 2 |
4 files changed, 6 insertions, 7 deletions
@@ -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 8a2aa7cf0d..d781ced09e 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 a88955bdfb..e6d52953b5 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 501a72f879..35e803d102 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 |