diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2012-03-27 00:16:09 +0200 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2012-03-27 00:16:09 +0200 |
| commit | 83cb2e5daef2f13c8098cda3e6a9708a372e967c (patch) | |
| tree | 54060e1c078fe0cdd9cc223a537be4c9a28b6a32 /tools | |
| parent | d5f4391187f8d1e93b313e8145ad81966308c913 (diff) | |
| download | rockbox-83cb2e5daef2f13c8098cda3e6a9708a372e967c.zip rockbox-83cb2e5daef2f13c8098cda3e6a9708a372e967c.tar.gz rockbox-83cb2e5daef2f13c8098cda3e6a9708a372e967c.tar.bz2 rockbox-83cb2e5daef2f13c8098cda3e6a9708a372e967c.tar.xz | |
Fix warble and clean up/refactor Makefile.
Change-Id: I8754ad8724e22147b98a156fecea599bdda72292
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/root.make | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tools/root.make b/tools/root.make index 032daf5..e42be04 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 |