summaryrefslogtreecommitdiff
path: root/tools/root.make
diff options
context:
space:
mode:
Diffstat (limited to 'tools/root.make')
-rw-r--r--tools/root.make16
1 files changed, 10 insertions, 6 deletions
diff --git a/tools/root.make b/tools/root.make
index 032daf5a1c..e42be044fc 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -63,12 +63,14 @@ all: $(DEPFILE) build
63# dependencies and compile rules 63# dependencies and compile rules
64include $(TOOLSDIR)/tools.make 64include $(TOOLSDIR)/tools.make
65 65
66ifeq (,$(findstring checkwps,$(APPSDIR))) 66ifneq (,$(findstring checkwps,$(APP_TYPE)))
67 ifeq (,$(findstring database,$(APPSDIR))) 67 ifneq (,$(findstring database,$(APP_TYPE)))
68 include $(FIRMDIR)/firmware.make 68 ifneq (,$(findstring warble,$(APP_TYPE)))
69 include $(ROOTDIR)/apps/bitmaps/bitmaps.make 69 include $(FIRMDIR)/firmware.make
70 ifeq (,$(findstring bootloader,$(APPSDIR))) 70 include $(ROOTDIR)/apps/bitmaps/bitmaps.make
71 include $(ROOTDIR)/lib/skin_parser/skin_parser.make 71 ifeq (,$(findstring bootloader,$(APPSDIR)))
72 include $(ROOTDIR)/lib/skin_parser/skin_parser.make
73 endif
72 endif 74 endif
73 endif 75 endif
74endif 76endif
@@ -97,6 +99,8 @@ else ifneq (,$(findstring database,$(APP_TYPE)))
97 include $(APPSDIR)/database.make 99 include $(APPSDIR)/database.make
98else ifneq (,$(findstring warble,$(APP_TYPE))) 100else ifneq (,$(findstring warble,$(APP_TYPE)))
99 include $(ROOTDIR)/lib/rbcodec/test/warble.make 101 include $(ROOTDIR)/lib/rbcodec/test/warble.make
102 include $(APPSDIR)/codecs/codecs.make
103 include $(ROOTDIR)/lib/rbcodec/rbcodec.make
100else 104else
101 include $(APPSDIR)/apps.make 105 include $(APPSDIR)/apps.make
102 include $(ROOTDIR)/lib/rbcodec/rbcodec.make 106 include $(ROOTDIR)/lib/rbcodec/rbcodec.make