summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcoen Hirschberg <marcoen@gmail.com>2006-02-24 13:48:52 +0000
committerMarcoen Hirschberg <marcoen@gmail.com>2006-02-24 13:48:52 +0000
commitf16c1f341a479a61e2cdf1f54de7106ac8d5fc36 (patch)
treee46bc273a0395fc501f0c4cce45b044ea58618af
parent1272c8a696c4b942b982a1841585b31bbcf2e9ab (diff)
downloadrockbox-f16c1f341a479a61e2cdf1f54de7106ac8d5fc36.tar.gz
rockbox-f16c1f341a479a61e2cdf1f54de7106ac8d5fc36.zip
prevent rockbox from using the wrong includes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8827 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/Makefile2
-rw-r--r--apps/codecs/Makefile2
-rw-r--r--apps/codecs/Tremor/Makefile2
-rw-r--r--apps/codecs/lib/Makefile4
-rw-r--r--apps/codecs/libfaad/Makefile2
-rw-r--r--apps/codecs/libffmpegFLAC/Makefile2
-rw-r--r--apps/codecs/libm4a/Makefile2
-rw-r--r--apps/codecs/libmad/Makefile2
-rw-r--r--apps/codecs/libmusepack/Makefile2
-rw-r--r--apps/codecs/libwavpack/Makefile2
-rw-r--r--apps/plugins/Makefile2
-rw-r--r--apps/plugins/databox/Makefile2
-rw-r--r--apps/plugins/lib/Makefile2
-rw-r--r--apps/plugins/rockboy/Makefile2
-rw-r--r--apps/plugins/searchengine/Makefile2
-rw-r--r--firmware/Makefile2
16 files changed, 17 insertions, 17 deletions
diff --git a/apps/Makefile b/apps/Makefile
index 55386c9e43..64bca835fc 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -54,7 +54,7 @@ ifdef APPEXTRA
INCLUDES += $(patsubst %,-I%,$(subst :, ,$(APPEXTRA)))
endif
-CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(DEFINES) -DTARGET_ID=$(TARGET_ID) \
+CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(DEFINES) -DTARGET_ID=$(TARGET_ID) \
-DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE}
OBJS2 := $(OBJDIR)/lang.o $(patsubst %.c, $(OBJDIR)/%.o, $(SRC))
diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile
index e0d4e47f54..f39eb55524 100644
--- a/apps/codecs/Makefile
+++ b/apps/codecs/Makefile
@@ -9,7 +9,7 @@
INCLUDES = -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \
-I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib -I$(BUILDDIR)
-CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
+CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \
-DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DCODEC
ifdef APPEXTRA
diff --git a/apps/codecs/Tremor/Makefile b/apps/codecs/Tremor/Makefile
index cec9797f63..ecd4ac9478 100644
--- a/apps/codecs/Tremor/Makefile
+++ b/apps/codecs/Tremor/Makefile
@@ -15,7 +15,7 @@ ifdef APPEXTRA
endif
TREMOROPTS = -O2
-CFLAGS = $(GCCOPTS) $(TREMOROPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
+CFLAGS = $(INCLUDES) $(GCCOPTS) $(TREMOROPTS) $(TARGET) $(EXTRA_DEFINES) \
-DMEM=${MEMORYSIZE} ${PROFILE_OPTS}
# This sets up 'SRC' based on the files mentioned in SOURCES
diff --git a/apps/codecs/lib/Makefile b/apps/codecs/lib/Makefile
index 49be70a62d..18f478c474 100644
--- a/apps/codecs/lib/Makefile
+++ b/apps/codecs/lib/Makefile
@@ -17,8 +17,8 @@ ifdef APPEXTRA
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
endif
-CFLAGS = $(GCCOPTS) \
-$(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} -DCODEC
+CFLAGS = $(INCLUDES) $(GCCOPTS) \
+$(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} -DCODEC
# This sets up 'SRC' based on the files mentioned in SOURCES
include $(TOOLSDIR)/makesrc.inc
diff --git a/apps/codecs/libfaad/Makefile b/apps/codecs/libfaad/Makefile
index 548ae5c602..bf30817aa2 100644
--- a/apps/codecs/libfaad/Makefile
+++ b/apps/codecs/libfaad/Makefile
@@ -15,7 +15,7 @@ ifdef APPEXTRA
endif
FAADOPTS = -O2 -Wno-char-subscripts
-CFLAGS = $(GCCOPTS) $(FAADOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
+CFLAGS = $(INCLUDES) $(GCCOPTS) $(FAADOPTS) $(TARGET) $(EXTRA_DEFINES) \
-DMEM=${MEMORYSIZE}
# This sets up 'SRC' based on the files mentioned in SOURCES
diff --git a/apps/codecs/libffmpegFLAC/Makefile b/apps/codecs/libffmpegFLAC/Makefile
index 7d9030e648..ee3f39261d 100644
--- a/apps/codecs/libffmpegFLAC/Makefile
+++ b/apps/codecs/libffmpegFLAC/Makefile
@@ -15,7 +15,7 @@ ifdef APPEXTRA
endif
FLACOPTS = -O2
-CFLAGS = $(GCCOPTS) $(FLACOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
+CFLAGS = $(INCLUDES) $(GCCOPTS) $(FLACOPTS) $(TARGET) $(EXTRA_DEFINES) \
-DMEM=${MEMORYSIZE} $(PROFILE_OPTS)
# This sets up 'SRC' based on the files mentioned in SOURCES
diff --git a/apps/codecs/libm4a/Makefile b/apps/codecs/libm4a/Makefile
index fcbc10045e..04e5fdf4c3 100644
--- a/apps/codecs/libm4a/Makefile
+++ b/apps/codecs/libm4a/Makefile
@@ -15,7 +15,7 @@ ifdef APPEXTRA
endif
M4AOPTS = -O3
-CFLAGS = $(GCCOPTS) $(M4AOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
+CFLAGS = $(INCLUDES) $(GCCOPTS) $(M4AOPTS) $(TARGET) $(EXTRA_DEFINES) \
-DMEM=${MEMORYSIZE} $(PROFILE_OPTS)
# This sets up 'SRC' based on the files mentioned in SOURCES
diff --git a/apps/codecs/libmad/Makefile b/apps/codecs/libmad/Makefile
index 3747197f13..ee5c0caca6 100644
--- a/apps/codecs/libmad/Makefile
+++ b/apps/codecs/libmad/Makefile
@@ -16,7 +16,7 @@ endif
# NOTE: FPM_ define has been moved to global.h
MADOPTS = -UDEBUG -DNDEBUG -O2
-CFLAGS = $(GCCOPTS) $(MADOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
+CFLAGS = $(INCLUDES) $(GCCOPTS) $(MADOPTS) $(TARGET) $(EXTRA_DEFINES) \
-DMEM=${MEMORYSIZE} $(PROFILE_OPTS)
# This sets up 'SRC' based on the files mentioned in SOURCES
diff --git a/apps/codecs/libmusepack/Makefile b/apps/codecs/libmusepack/Makefile
index 6bfa2f9462..f5c59cce4a 100644
--- a/apps/codecs/libmusepack/Makefile
+++ b/apps/codecs/libmusepack/Makefile
@@ -15,7 +15,7 @@ ifdef APPEXTRA
endif
MUSEPACKOPTS = -O2
-CFLAGS = $(GCCOPTS) $(MUSEPACKOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
+CFLAGS = $(INCLUDES) $(GCCOPTS) $(MUSEPACKOPTS) $(TARGET) $(EXTRA_DEFINES) \
-DMEM=${MEMORYSIZE} $(PROFILE_OPTS)
# This sets up 'SRC' based on the files mentioned in SOURCES
diff --git a/apps/codecs/libwavpack/Makefile b/apps/codecs/libwavpack/Makefile
index eba67fa7fc..60911a052f 100644
--- a/apps/codecs/libwavpack/Makefile
+++ b/apps/codecs/libwavpack/Makefile
@@ -15,7 +15,7 @@ ifdef APPEXTRA
endif
WAVPACKOPTS = -O2
-CFLAGS = $(GCCOPTS) $(WAVPACKOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
+CFLAGS = $(INCLUDES) $(GCCOPTS) $(WAVPACKOPTS) $(TARGET) $(EXTRA_DEFINES) \
-DMEM=${MEMORYSIZE} $(PROFILE_OPTS)
# This sets up 'SRC' based on the files mentioned in SOURCES
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile
index 6f57636c69..32286a25df 100644
--- a/apps/plugins/Makefile
+++ b/apps/plugins/Makefile
@@ -10,7 +10,7 @@
INCLUDES = -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \
-I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib -I$(BUILDDIR) \
-I$(BUILDDIR)/pluginbitmaps
-CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
+CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \
-DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN
ifdef APPEXTRA
diff --git a/apps/plugins/databox/Makefile b/apps/plugins/databox/Makefile
index 6a44333b3f..1205234d38 100644
--- a/apps/plugins/databox/Makefile
+++ b/apps/plugins/databox/Makefile
@@ -9,7 +9,7 @@
INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR)
-CFLAGS = $(GCCOPTS) -O3 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
+CFLAGS = $(INCLUDES) $(GCCOPTS) -O3 $(TARGET) $(EXTRA_DEFINES) \
-DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN
ifdef APPEXTRA
diff --git a/apps/plugins/lib/Makefile b/apps/plugins/lib/Makefile
index ca9c3f3576..916c63203d 100644
--- a/apps/plugins/lib/Makefile
+++ b/apps/plugins/lib/Makefile
@@ -17,7 +17,7 @@ ifdef APPEXTRA
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
endif
-CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
+CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \
-DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN
# Sectioned compilation for target
diff --git a/apps/plugins/rockboy/Makefile b/apps/plugins/rockboy/Makefile
index d9d310702f..694dcde251 100644
--- a/apps/plugins/rockboy/Makefile
+++ b/apps/plugins/rockboy/Makefile
@@ -9,7 +9,7 @@
INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR)
-CFLAGS = $(GCCOPTS) -O2 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
+CFLAGS = $(INCLUDES) $(GCCOPTS) -O2 $(TARGET) $(EXTRA_DEFINES) \
-DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN -finline-functions
ifdef APPEXTRA
diff --git a/apps/plugins/searchengine/Makefile b/apps/plugins/searchengine/Makefile
index baa0020cc2..21b53cbefe 100644
--- a/apps/plugins/searchengine/Makefile
+++ b/apps/plugins/searchengine/Makefile
@@ -9,7 +9,7 @@
INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR)
-CFLAGS = $(GCCOPTS) -O3 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
+CFLAGS = $(INCLUDES) $(GCCOPTS) -O3 $(TARGET) $(EXTRA_DEFINES) \
-DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN
ifdef APPEXTRA
diff --git a/firmware/Makefile b/firmware/Makefile
index 0956f56329..41485da861 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -9,7 +9,7 @@
INCLUDES=-Iinclude -I$(FIRMDIR) -Iexport -Icommon -Idrivers -I$(BUILDDIR)
-CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(BUILDDATE) $(EXTRA_DEFINES) \
+CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(BUILDDATE) $(EXTRA_DEFINES) \
-DMEM=${MEMORYSIZE}
# This sets up 'SRC' based on the files mentioned in SOURCES