From 83cb2e5daef2f13c8098cda3e6a9708a372e967c Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
Date: Tue, 27 Mar 2012 00:16:09 +0200
Subject: Fix warble and clean up/refactor Makefile.

Change-Id: I8754ad8724e22147b98a156fecea599bdda72292
---
 tools/root.make | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'tools/root.make')

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
 # dependencies and compile rules
 include $(TOOLSDIR)/tools.make
 
-ifeq (,$(findstring checkwps,$(APPSDIR)))
-  ifeq (,$(findstring database,$(APPSDIR)))
-    include $(FIRMDIR)/firmware.make
-    include $(ROOTDIR)/apps/bitmaps/bitmaps.make
-	ifeq (,$(findstring bootloader,$(APPSDIR)))
-      include $(ROOTDIR)/lib/skin_parser/skin_parser.make
+ifneq (,$(findstring checkwps,$(APP_TYPE)))
+  ifneq (,$(findstring database,$(APP_TYPE)))
+    ifneq (,$(findstring warble,$(APP_TYPE)))
+      include $(FIRMDIR)/firmware.make
+      include $(ROOTDIR)/apps/bitmaps/bitmaps.make
+	  ifeq (,$(findstring bootloader,$(APPSDIR)))
+        include $(ROOTDIR)/lib/skin_parser/skin_parser.make
+      endif
     endif
   endif
 endif
@@ -97,6 +99,8 @@ else ifneq (,$(findstring database,$(APP_TYPE)))
   include $(APPSDIR)/database.make
 else ifneq (,$(findstring warble,$(APP_TYPE)))
   include $(ROOTDIR)/lib/rbcodec/test/warble.make
+  include $(APPSDIR)/codecs/codecs.make
+  include $(ROOTDIR)/lib/rbcodec/rbcodec.make
 else
   include $(APPSDIR)/apps.make
   include $(ROOTDIR)/lib/rbcodec/rbcodec.make
-- 
cgit v1.2.3