summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2013-01-24 16:01:28 +0100
committerBjörn Stenberg <bjorn@haxx.se>2013-01-24 16:06:45 +0100
commit1501df045f75b1ee607b49ce2f970c762a2538a4 (patch)
tree2cc1515e773eac5efd9a771a3bdcc93ec2d3c1c9 /tools
parent02a90890343a75ca71169f601605613607e450ea (diff)
Deprecate the EXTRA_LIBS variable.
Instead specify explicit library dependencies for codecs and plugins.
Diffstat (limited to 'tools')
-rw-r--r--tools/root.make6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/root.make b/tools/root.make
index 256d25c1df..c8c4eb4f89 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -62,8 +62,8 @@ endif
all: $(DEPFILE) build
# Subdir makefiles. their primary purpose is to populate SRC, OTHER_SRC,
-# ASMDEFS_SRC, CORE_LIBS and EXTRA_LIBS. But they also define special
-# dependencies and compile rules
+# ASMDEFS_SRC and CORE_LIBS. But they also define special dependencies and
+# compile rules
include $(TOOLSDIR)/tools.make
ifeq (,$(findstring checkwps,$(APP_TYPE)))
@@ -71,7 +71,7 @@ ifeq (,$(findstring checkwps,$(APP_TYPE)))
ifeq (,$(findstring warble,$(APP_TYPE)))
include $(FIRMDIR)/firmware.make
include $(ROOTDIR)/apps/bitmaps/bitmaps.make
- ifeq (,$(findstring bootloader,$(APPSDIR)))
+ ifeq (,$(findstring bootloader,$(APPSDIR)))
include $(ROOTDIR)/lib/skin_parser/skin_parser.make
include $(ROOTDIR)/lib/tlsf/libtlsf.make
endif