aboutsummaryrefslogtreecommitdiffstats
path: root/subdir.mak
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-07-10 22:01:41 +0100
committerMans Rullgard <mans@mansr.com>2011-07-11 11:39:04 +0100
commitca9036155d28ed9f5a1406356316c3fd41e5a400 (patch)
tree0d4a450a1356867d86c2605d2dfbf5aeead5d2b9 /subdir.mak
parentd1cf45911935cc4fed9afd3a37d99616d31eb9da (diff)
downloadffmpeg-ca9036155d28ed9f5a1406356316c3fd41e5a400.tar.gz
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>
Diffstat (limited to 'subdir.mak')
-rw-r--r--subdir.mak4
1 files changed, 2 insertions, 2 deletions
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::