1
0
Fork 0
forked from len0rd/rockbox

Fix warble and clean up/refactor Makefile.

Change-Id: I8754ad8724e22147b98a156fecea599bdda72292
This commit is contained in:
Thomas Martitz 2012-03-27 00:16:09 +02:00
parent d5f4391187
commit 83cb2e5dae
2 changed files with 15 additions and 19 deletions

View file

@ -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