diff options
-rw-r--r-- | apps/Makefile | 4 | ||||
-rw-r--r-- | apps/codecs/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/Tremor/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/lib/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/libFLAC/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/liba52/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/libalac/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/libffmpegFLAC/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/libmad/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/libmusepack/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/libwavpack/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/databox/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/lib/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/rockboy/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/searchengine/Makefile | 2 | ||||
-rw-r--r-- | bootloader/Makefile | 4 | ||||
-rw-r--r-- | flash/bootbox/Makefile | 4 |
18 files changed, 21 insertions, 21 deletions
diff --git a/apps/Makefile b/apps/Makefile index 04e0e87728..0c888a1812 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
@@ -30,8 +30,8 @@ DEFINES = $(DEBUG) | |||
30 | DIRS = . | 30 | DIRS = . |
31 | 31 | ||
32 | ifdef APPEXTRA | 32 | ifdef APPEXTRA |
33 | DIRS += $(APPEXTRA) | 33 | DIRS += $(subst :, ,$(APPEXTRA)) |
34 | INCLUDES += -I$(APPEXTRA) | 34 | INCLUDES += $(patsubst %,-I%,$(subst :, ,$(APPEXTRA))) |
35 | endif | 35 | endif |
36 | 36 | ||
37 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(DEFINES) \ | 37 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(DEFINES) \ |
diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile index b29ed738b0..2c1cd93cc6 100644 --- a/apps/codecs/Makefile +++ b/apps/codecs/Makefile | |||
@@ -13,7 +13,7 @@ CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | |||
13 | -DMEM=${MEMORYSIZE} -DCODEC | 13 | -DMEM=${MEMORYSIZE} -DCODEC |
14 | 14 | ||
15 | ifdef APPEXTRA | 15 | ifdef APPEXTRA |
16 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 16 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
17 | endif | 17 | endif |
18 | 18 | ||
19 | ifdef SOFTWARECODECS | 19 | ifdef SOFTWARECODECS |
diff --git a/apps/codecs/Tremor/Makefile b/apps/codecs/Tremor/Makefile index d721d1c200..4eadd24a10 100644 --- a/apps/codecs/Tremor/Makefile +++ b/apps/codecs/Tremor/Makefile | |||
@@ -11,7 +11,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | |||
11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) | 11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) |
12 | 12 | ||
13 | ifdef APPEXTRA | 13 | ifdef APPEXTRA |
14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 14 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
15 | endif | 15 | endif |
16 | 16 | ||
17 | TREMOROPTS = -O2 | 17 | TREMOROPTS = -O2 |
diff --git a/apps/codecs/lib/Makefile b/apps/codecs/lib/Makefile index 52eaf0e893..49be70a62d 100644 --- a/apps/codecs/lib/Makefile +++ b/apps/codecs/lib/Makefile | |||
@@ -14,7 +14,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | |||
14 | -I$(FIRMDIR)/common -I$(BUILDDIR) | 14 | -I$(FIRMDIR)/common -I$(BUILDDIR) |
15 | 15 | ||
16 | ifdef APPEXTRA | 16 | ifdef APPEXTRA |
17 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 17 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
18 | endif | 18 | endif |
19 | 19 | ||
20 | CFLAGS = $(GCCOPTS) \ | 20 | CFLAGS = $(GCCOPTS) \ |
diff --git a/apps/codecs/libFLAC/Makefile b/apps/codecs/libFLAC/Makefile index 9da55ba0e2..4008479649 100644 --- a/apps/codecs/libFLAC/Makefile +++ b/apps/codecs/libFLAC/Makefile | |||
@@ -12,7 +12,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | |||
12 | -I$(BUILDDIR) | 12 | -I$(BUILDDIR) |
13 | 13 | ||
14 | ifdef APPEXTRA | 14 | ifdef APPEXTRA |
15 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 15 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
16 | endif | 16 | endif |
17 | 17 | ||
18 | NEWGCC=$(shell expr $(GCCNUM) ">" 303) | 18 | NEWGCC=$(shell expr $(GCCNUM) ">" 303) |
diff --git a/apps/codecs/liba52/Makefile b/apps/codecs/liba52/Makefile index b31903f492..54542c096e 100644 --- a/apps/codecs/liba52/Makefile +++ b/apps/codecs/liba52/Makefile | |||
@@ -11,7 +11,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | |||
11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) | 11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) |
12 | 12 | ||
13 | ifdef APPEXTRA | 13 | ifdef APPEXTRA |
14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 14 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
15 | endif | 15 | endif |
16 | 16 | ||
17 | A52OPTS = | 17 | A52OPTS = |
diff --git a/apps/codecs/libalac/Makefile b/apps/codecs/libalac/Makefile index b815db54b7..5bffb0669e 100644 --- a/apps/codecs/libalac/Makefile +++ b/apps/codecs/libalac/Makefile | |||
@@ -11,7 +11,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | |||
11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) | 11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) |
12 | 12 | ||
13 | ifdef APPEXTRA | 13 | ifdef APPEXTRA |
14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 14 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
15 | endif | 15 | endif |
16 | 16 | ||
17 | ALACOPTS = -O3 | 17 | ALACOPTS = -O3 |
diff --git a/apps/codecs/libffmpegFLAC/Makefile b/apps/codecs/libffmpegFLAC/Makefile index 240ce28a00..410b95b91b 100644 --- a/apps/codecs/libffmpegFLAC/Makefile +++ b/apps/codecs/libffmpegFLAC/Makefile | |||
@@ -11,7 +11,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | |||
11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) | 11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) |
12 | 12 | ||
13 | ifdef APPEXTRA | 13 | ifdef APPEXTRA |
14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 14 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
15 | endif | 15 | endif |
16 | 16 | ||
17 | FLACOPTS = -O2 | 17 | FLACOPTS = -O2 |
diff --git a/apps/codecs/libmad/Makefile b/apps/codecs/libmad/Makefile index a6f310195c..14c25c6b29 100644 --- a/apps/codecs/libmad/Makefile +++ b/apps/codecs/libmad/Makefile | |||
@@ -11,7 +11,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | |||
11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) | 11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) |
12 | 12 | ||
13 | ifdef APPEXTRA | 13 | ifdef APPEXTRA |
14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 14 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
15 | endif | 15 | endif |
16 | 16 | ||
17 | # NOTE: FPM_ define has been moved to global.h | 17 | # NOTE: FPM_ define has been moved to global.h |
diff --git a/apps/codecs/libmusepack/Makefile b/apps/codecs/libmusepack/Makefile index 79ebffe9b8..6912f74e75 100644 --- a/apps/codecs/libmusepack/Makefile +++ b/apps/codecs/libmusepack/Makefile | |||
@@ -11,7 +11,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | |||
11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) | 11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) |
12 | 12 | ||
13 | ifdef APPEXTRA | 13 | ifdef APPEXTRA |
14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 14 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
15 | endif | 15 | endif |
16 | 16 | ||
17 | MUSEPACKOPTS = -O2 | 17 | MUSEPACKOPTS = -O2 |
diff --git a/apps/codecs/libwavpack/Makefile b/apps/codecs/libwavpack/Makefile index 75b9060534..6b9461bbb9 100644 --- a/apps/codecs/libwavpack/Makefile +++ b/apps/codecs/libwavpack/Makefile | |||
@@ -11,7 +11,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | |||
11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) | 11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) |
12 | 12 | ||
13 | ifdef APPEXTRA | 13 | ifdef APPEXTRA |
14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 14 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
15 | endif | 15 | endif |
16 | 16 | ||
17 | CFLAGS = $(GCCOPTS) \ | 17 | CFLAGS = $(GCCOPTS) \ |
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index c7aa438b60..ec75876969 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile | |||
@@ -13,7 +13,7 @@ CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | |||
13 | -DMEM=${MEMORYSIZE} -DPLUGIN | 13 | -DMEM=${MEMORYSIZE} -DPLUGIN |
14 | 14 | ||
15 | ifdef APPEXTRA | 15 | ifdef APPEXTRA |
16 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 16 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
17 | endif | 17 | endif |
18 | 18 | ||
19 | ifdef SOFTWARECODECS | 19 | ifdef SOFTWARECODECS |
diff --git a/apps/plugins/databox/Makefile b/apps/plugins/databox/Makefile index a8a6baa557..12b211d527 100644 --- a/apps/plugins/databox/Makefile +++ b/apps/plugins/databox/Makefile | |||
@@ -13,7 +13,7 @@ CFLAGS = $(GCCOPTS) -O3 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | |||
13 | -DMEM=${MEMORYSIZE} -DPLUGIN | 13 | -DMEM=${MEMORYSIZE} -DPLUGIN |
14 | 14 | ||
15 | ifdef APPEXTRA | 15 | ifdef APPEXTRA |
16 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 16 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
17 | endif | 17 | endif |
18 | 18 | ||
19 | LINKFILE := $(OBJDIR)/link.lds | 19 | LINKFILE := $(OBJDIR)/link.lds |
diff --git a/apps/plugins/lib/Makefile b/apps/plugins/lib/Makefile index 7eddccddc5..9b4b0b6286 100644 --- a/apps/plugins/lib/Makefile +++ b/apps/plugins/lib/Makefile | |||
@@ -14,7 +14,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | |||
14 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) | 14 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) |
15 | 15 | ||
16 | ifdef APPEXTRA | 16 | ifdef APPEXTRA |
17 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 17 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
18 | endif | 18 | endif |
19 | 19 | ||
20 | CFLAGS = $(GCCOPTS) \ | 20 | CFLAGS = $(GCCOPTS) \ |
diff --git a/apps/plugins/rockboy/Makefile b/apps/plugins/rockboy/Makefile index 1d32e0a84c..23c614210a 100644 --- a/apps/plugins/rockboy/Makefile +++ b/apps/plugins/rockboy/Makefile | |||
@@ -13,7 +13,7 @@ CFLAGS = $(GCCOPTS) -O3 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | |||
13 | -DMEM=${MEMORYSIZE} -DPLUGIN | 13 | -DMEM=${MEMORYSIZE} -DPLUGIN |
14 | 14 | ||
15 | ifdef APPEXTRA | 15 | ifdef APPEXTRA |
16 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 16 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
17 | endif | 17 | endif |
18 | 18 | ||
19 | LINKFILE := $(OBJDIR)/link.lds | 19 | LINKFILE := $(OBJDIR)/link.lds |
diff --git a/apps/plugins/searchengine/Makefile b/apps/plugins/searchengine/Makefile index 992beb0707..26e8517db2 100644 --- a/apps/plugins/searchengine/Makefile +++ b/apps/plugins/searchengine/Makefile | |||
@@ -13,7 +13,7 @@ CFLAGS = $(GCCOPTS) -O3 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | |||
13 | -DMEM=${MEMORYSIZE} -DPLUGIN | 13 | -DMEM=${MEMORYSIZE} -DPLUGIN |
14 | 14 | ||
15 | ifdef APPEXTRA | 15 | ifdef APPEXTRA |
16 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 16 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
17 | endif | 17 | endif |
18 | 18 | ||
19 | LINKFILE := $(OBJDIR)/link.lds | 19 | LINKFILE := $(OBJDIR)/link.lds |
diff --git a/bootloader/Makefile b/bootloader/Makefile index c2bc54a6da..d1a17df56a 100644 --- a/bootloader/Makefile +++ b/bootloader/Makefile | |||
@@ -22,8 +22,8 @@ SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARG | |||
22 | DIRS = . | 22 | DIRS = . |
23 | 23 | ||
24 | ifdef APPEXTRA | 24 | ifdef APPEXTRA |
25 | DIRS += $(APPEXTRA) | 25 | DIRS += $(subst :, ,$(APPEXTRA)) |
26 | INCLUDES += -I$(APPEXTRA) | 26 | INCLUDES += $(patsubst %,-I%,$(subst :, ,$(APPEXTRA))) |
27 | endif | 27 | endif |
28 | 28 | ||
29 | ifndef VERSION | 29 | ifndef VERSION |
diff --git a/flash/bootbox/Makefile b/flash/bootbox/Makefile index e08c26f53e..3355238632 100644 --- a/flash/bootbox/Makefile +++ b/flash/bootbox/Makefile | |||
@@ -22,8 +22,8 @@ SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARG | |||
22 | DIRS = . | 22 | DIRS = . |
23 | 23 | ||
24 | ifdef APPEXTRA | 24 | ifdef APPEXTRA |
25 | DIRS += $(APPEXTRA) | 25 | DIRS += $(subst :, ,$(APPEXTRA)) |
26 | INCLUDES += -I$(APPEXTRA) | 26 | INCLUDES += $(patsubst %,-I%,$(subst :, ,$(APPEXTRA))) |
27 | endif | 27 | endif |
28 | 28 | ||
29 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(DEFINES) \ | 29 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(DEFINES) \ |