From 30461369def481c2eb53d36f63644eaff7de4a1d Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 2 Sep 2006 21:31:16 +0000 Subject: settings.h includs button.h that includes target-button.h so we need to make sure all these knows how to find that include file as otherwise does the depfile generation break down git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10858 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/Makefile | 3 +-- apps/codecs/libfaad/Makefile | 4 ++-- apps/codecs/libm4a/Makefile | 4 ++-- apps/codecs/libmad/Makefile | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile index 6e4663be41..695b4546b0 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 = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \ +CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET_INC) $(TARGET) $(EXTRA_DEFINES) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DCODEC ifdef APPEXTRA @@ -68,7 +68,6 @@ $(OBJDIR)/%.elf : -lgcc -T$(LINKCODEC) -Wl,-Map,$(OBJDIR)/$*.map $(BUILDDIR)/%.a : % $(CODECDEPS) - $(OBJDIR)/%.codec : $(OBJDIR)/%.elf @echo "OBJCOPY $(notdir $@)" diff --git a/apps/codecs/libfaad/Makefile b/apps/codecs/libfaad/Makefile index bf30817aa2..57c871fba7 100644 --- a/apps/codecs/libfaad/Makefile +++ b/apps/codecs/libfaad/Makefile @@ -15,8 +15,8 @@ ifdef APPEXTRA endif FAADOPTS = -O2 -Wno-char-subscripts -CFLAGS = $(INCLUDES) $(GCCOPTS) $(FAADOPTS) $(TARGET) $(EXTRA_DEFINES) \ - -DMEM=${MEMORYSIZE} +CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET_INC) $(FAADOPTS) $(TARGET) \ + $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} # This sets up 'SRC' based on the files mentioned in SOURCES include $(TOOLSDIR)/makesrc.inc diff --git a/apps/codecs/libm4a/Makefile b/apps/codecs/libm4a/Makefile index 04e5fdf4c3..ad084b0ddf 100644 --- a/apps/codecs/libm4a/Makefile +++ b/apps/codecs/libm4a/Makefile @@ -15,8 +15,8 @@ ifdef APPEXTRA endif M4AOPTS = -O3 -CFLAGS = $(INCLUDES) $(GCCOPTS) $(M4AOPTS) $(TARGET) $(EXTRA_DEFINES) \ - -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) +CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET_INC) $(M4AOPTS) $(TARGET) \ + $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) # This sets up 'SRC' based on the files mentioned in SOURCES include $(TOOLSDIR)/makesrc.inc diff --git a/apps/codecs/libmad/Makefile b/apps/codecs/libmad/Makefile index 40ea420a0b..c24a693374 100644 --- a/apps/codecs/libmad/Makefile +++ b/apps/codecs/libmad/Makefile @@ -24,8 +24,8 @@ else MADOPTS += -O2 endif -CFLAGS = $(INCLUDES) $(GCCOPTS) $(MADOPTS) $(TARGET) $(EXTRA_DEFINES) \ - -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) +CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET_INC) $(MADOPTS) $(TARGET) \ +$(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) # This sets up 'SRC' based on the files mentioned in SOURCES include $(TOOLSDIR)/makesrc.inc -- cgit v1.2.3