Fixed makefiles for autoconf.g include.

Fixed build output look in several Makefiles
Fixed code to include autoconf.h
Fixed code to use ROCKBOX_*_ENDIAN instead of previous attempts.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6421 a1c6a512-1295-4272-9138-f99709370657

8 files changed, 45 insertions, 40 deletions

diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile
index 341e0e67c2..ffd8eab44d 100644
--- a/apps/codecs/Makefile
+++ b/apps/codecs/Makefile
@@ -8,7 +8,7 @@
 #
 
 INCLUDES = -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \
- -I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib
+ -I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib -I$(BUILDDIR)
 CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
  -DMEM=${MEMORYSIZE}
 
@@ -28,44 +28,45 @@ include $(TOOLSDIR)/make.inc
 libmad:
         @echo "MAKE in libmad"
         @mkdir -p $(OBJDIR)/libmad
-        @$(MAKE) -C libmad TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/libmad VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} OUTPUT=$(OBJDIR)/libmad.a
+        @$(MAKE) -C libmad OBJDIR=$(OBJDIR)/libmad OUTPUT=$(BUILDDIR)/libmad.a
 
 liba52:
         @echo "MAKE in liba52"
         @mkdir -p $(OBJDIR)/liba52
-        @$(MAKE) -C liba52 TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/liba52 VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} OUTPUT=$(OBJDIR)/liba52.a
+        @$(MAKE) -C liba52 OBJDIR=$(OBJDIR)/liba52 OUTPUT=$(BUILDDIR)/liba52.a
 
 libFLAC:
         @echo "MAKE in libFLAC"
         @mkdir -p $(OBJDIR)/libFLAC
-        @$(MAKE) -C libFLAC TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/libFLAC VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} OUTPUT=$(OBJDIR)/libFLAC.a
+        @$(MAKE) -C libFLAC OBJDIR=$(OBJDIR)/libFLAC OUTPUT=$(BUILDDIR)/libFLAC.a
 
 libTremor:
         @echo "MAKE in Tremor"
         @mkdir -p $(OBJDIR)/Tremor
-        @$(MAKE) -C Tremor TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/Tremor VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} OUTPUT=$(OBJDIR)/libTremor.a
+        @$(MAKE) -C Tremor OBJDIR=$(OBJDIR)/Tremor OUTPUT=$(BUILDDIR)/libTremor.a
 
 libwavpack:
         @echo "MAKE in libwavpack"
         @mkdir -p $(OBJDIR)/libwavpack
-        @$(MAKE) -C libwavpack TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/libwavpack VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} OUTPUT=$(OBJDIR)/libwavpack.a
+        @$(MAKE) -C libwavpack OBJDIR=$(OBJDIR)/libwavpack OUTPUT=$(BUILDDIR)/libwavpack.a
 
 dumb:
         @echo "MAKE in dumb"
         @mkdir -p $(OBJDIR)/dumb
-        @$(MAKE) -C dumb TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/dumb VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} LIBDIR=$(OBJDIR) OFLAGS="$(CFLAGS)"
+        @$(MAKE) -C dumb OBJDIR=$(OBJDIR)/dumb LIBDIR=$(BUILDDIR) OFLAGS="$(CFLAGS)"
 
 libmusepack:
         @echo "MAKE in libmusepack"
         @mkdir -p $(OBJDIR)/libmusepack
-        @$(MAKE) -C libmusepack TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR)/libmusepack VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEMORYSIZE} OUTPUT=$(OBJDIR)/libmusepack.a
+        @$(MAKE) -C libmusepack OBJDIR=$(OBJDIR)/libmusepack OUTPUT=$(BUILDDIR)/libmusepack.a
 
 clean:
         @echo "cleaning codecs"
-        @rm -fr $(OBJDIR)/libmad $(OBJDIR)/libmad.a $(OBJDIR)/liba52 $(OBJDIR)/libFLAC $(OBJDIR)/Tremor $(OBJDIR)/libwavpack $(OBJDIR)/dumb $(OBJDIR)/libdumb.a $(OBJDIR)/libdumbd.a $(OBJDIR)/libmusepack $(OBJDIR)/libmusepack.a
-        @$(MAKE) -C libmad clean
-        @$(MAKE) -C liba52 clean
-        @$(MAKE) -C libFLAC clean
-        @$(MAKE) -C Tremor clean
-        @$(MAKE) -C libwavpack clean
-        @$(MAKE) -C libmusepack clean
+        $(SILENT)rm -fr $(OBJDIR)/libmad $(BUILDDIR)/libmad.a $(OBJDIR)/liba52 $(OBJDIR)/libFLAC $(OBJDIR)/Tremor $(OBJDIR)/libwavpack $(OBJDIR)/dumb $(BUILDDIR)/libdumb.a $(BUILDDIR)/libdumbd.a $(OBJDIR)/libmusepack $(BUILDDIR)/libmusepack.a
+        @$(MAKE) -C libmad clean OBJDIR=$(OBJDIR)/libmad
+        @$(MAKE) -C liba52 clean OBJDIR=$(OBJDIR)/liba52
+        @$(MAKE) -C libFLAC clean OBJDIR=$(OBJDIR)/libFLAC
+        @$(MAKE) -C Tremor clean OBJDIR=$(OBJDIR)/Tremor
+        @$(MAKE) -C libwavpack clean OBJDIR=$(OBJDIR)/libwavpack
+        @$(MAKE) -C libmusepack clean OBJDIR=$(OBJDIR)/libmusepack
+        @$(MAKE) -C dumb clean OBJDIR=$(OBJDIR)/dumb
diff --git a/apps/codecs/Tremor/Makefile b/apps/codecs/Tremor/Makefile
index 5e97c60534..20e30bbbf6 100644
--- a/apps/codecs/Tremor/Makefile
+++ b/apps/codecs/Tremor/Makefile
@@ -8,14 +8,15 @@
 #
 
 INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
- -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers
+ -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
 
 ifdef APPEXTRA
 INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
 endif
 
 TREMOROPTS =
-CFLAGS = $(GCCOPTS) $(TREMOROPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE}
+CFLAGS = $(GCCOPTS) $(TREMOROPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
+-DMEM=${MEMORYSIZE}
 
 # This sets up 'SRC' based on the files mentioned in SOURCES
 include $(TOOLSDIR)/makesrc.inc
@@ -26,7 +27,7 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2))
 DEPFILE = $(OBJDIR)/dep-Tremor
 DIRS = 
 
-OUTPUT = $(OBJDIR)/libTremor.a
+OUTPUT = $(BUILDDIR)/libTremor.a
 
 all: $(OUTPUT)
 
@@ -35,7 +36,7 @@ $(OUTPUT): $(OBJS)
         @$(AR) ruv $@ $+ >/dev/null 2>&1
 
 $(OBJDIR)/Tremor/%.o: $(APPSDIR)/codecs/Tremor/%.c
-        @echo "CC $<"
+        @echo "(Tremor) CC $<"
         @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/Tremor/ $< -o $@
 
 include $(TOOLSDIR)/make.inc
diff --git a/apps/codecs/Tremor/config-tremor.h b/apps/codecs/Tremor/config-tremor.h
index e53c04898c..81aa5bffab 100644
--- a/apps/codecs/Tremor/config-tremor.h
+++ b/apps/codecs/Tremor/config-tremor.h
@@ -1,11 +1,12 @@
 #include "../codec.h"
 
+#ifdef ROCKBOX_BIG_ENDIAN
 #define BIG_ENDIAN 1
 #define LITTLE_ENDIAN 0
-#define _LOW_ACCURACY_
-
-#ifdef SIMULATOR
-  #define BYTE_ORDER LITTLE_ENDIAN
+#define BYTE_ORDER BIG_ENDIAN
 #else
-  #define BYTE_ORDER BIG_ENDIAN
+#define BYTE_ORDER LITTLE_ENDIAN
+#define LITTLE_ENDIAN 1
+#define BIG_ENDIAN 0
 #endif
+#define _LOW_ACCURACY_
diff --git a/apps/codecs/libFLAC/Makefile b/apps/codecs/libFLAC/Makefile
index 1c8b0682a7..9da55ba0e2 100644
--- a/apps/codecs/libFLAC/Makefile
+++ b/apps/codecs/libFLAC/Makefile
@@ -7,8 +7,9 @@
 # $Id$
 #
 
-INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
- -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(APPSDIR)/codecs/libFLAC/include
+INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export       \
+ -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(APPSDIR)/codecs/libFLAC/include \
+ -I$(BUILDDIR)
 
 ifdef APPEXTRA
 INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
@@ -16,9 +17,10 @@ endif
 
 NEWGCC=$(shell expr $(GCCNUM) ">" 303)
 
-FLACOPTS = -DFLAC__NO_ASM -DFLAC__ALIGN_MALLOC_DATA                           \
--DFLAC__INTEGER_ONLY_LIBRARY -DVERSION=\"1.1.2\" -fomit-frame-pointer         \
--funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__
+FLACOPTS = -DFLAC__NO_ASM -DFLAC__ALIGN_MALLOC_DATA                     \
+-DFLAC__INTEGER_ONLY_LIBRARY -DVERSION=\"1.1.2\" -fomit-frame-pointer   \
+-funroll-loops -finline-functions -Wall -W -Wno-inline                  \
+-DFLaC__INLINE=__inline__
 
 ifeq ($(NEWGCC), 1)
   # this is 3.4.X options:
@@ -37,7 +39,7 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2))
 DEPFILE = $(OBJDIR)/dep-libFLAC
 DIRS = 
 
-OUTPUT = $(OBJDIR)/libFLAC.a
+OUTPUT = $(BUILDDIR)/libFLAC.a
 
 all: $(OUTPUT)
 
@@ -47,7 +49,7 @@ $(OUTPUT): $(OBJS)
 
 $(OBJDIR)/libFLAC/%.o: $(APPSDIR)/codecs/libFLAC/%.c
         @mkdir -p $(OBJDIR)/libFLAC
-        @echo "CC $<"
+        @echo "(libFLAC) CC $<"
         @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libFLAC/include/FLAC $< -o $@
 
 include $(TOOLSDIR)/make.inc
diff --git a/apps/codecs/liba52/Makefile b/apps/codecs/liba52/Makefile
index 7baa71feb0..b31903f492 100644
--- a/apps/codecs/liba52/Makefile
+++ b/apps/codecs/liba52/Makefile
@@ -8,7 +8,7 @@
 #
 
 INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
- -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers
+ -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
 
 ifdef APPEXTRA
 INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
@@ -26,7 +26,7 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2))
 DEPFILE = $(OBJDIR)/dep-liba52
 DIRS = 
 
-OUTPUT = $(OBJDIR)/liba52.a
+OUTPUT = $(BUILDDIR)/liba52.a
 
 all: $(OUTPUT)
 
@@ -35,7 +35,7 @@ $(OUTPUT): $(OBJS)
         @$(AR) ruv $@ $+ >/dev/null 2>&1
 
 $(OBJDIR)/liba52/%.o: $(APPSDIR)/codecs/liba52/%.c
-        @echo "CC $<"
+        @echo "(liba52) CC $<"
         @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/liba52/ $< -o $@
 
 include $(TOOLSDIR)/make.inc
diff --git a/apps/codecs/liba52/config-a52.h b/apps/codecs/liba52/config-a52.h
index 1aec4cda14..9e38034783 100644
--- a/apps/codecs/liba52/config-a52.h
+++ b/apps/codecs/liba52/config-a52.h
@@ -20,7 +20,7 @@
 
 /* Used in bitstream.h */
 
-#ifndef SIMULATOR
+#ifdef ROCKBOX_BIG_ENDIAN
 #define WORDS_BIGENDIAN 1
 #endif
 
diff --git a/apps/codecs/libmad/Makefile b/apps/codecs/libmad/Makefile
index 74c726068e..1228cce16f 100644
--- a/apps/codecs/libmad/Makefile
+++ b/apps/codecs/libmad/Makefile
@@ -8,7 +8,7 @@
 #
 
 INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
- -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers
+ -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
 
 ifdef APPEXTRA
 INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
@@ -34,7 +34,7 @@ $(OUTPUT): $(OBJS)
         $(AR) ruv $@ $+ >/dev/null 2>&1
 
 $(OBJDIR)/%.o: $(APPSDIR)/codecs/libmad/%.c
-        @echo "CC $<"
+        @echo "(libmad) CC "`basename $<`
         @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libmad/ $< -o $@
 
 include $(TOOLSDIR)/make.inc
diff --git a/apps/codecs/libwavpack/Makefile b/apps/codecs/libwavpack/Makefile
index 54d95be2c0..df26559f59 100644
--- a/apps/codecs/libwavpack/Makefile
+++ b/apps/codecs/libwavpack/Makefile
@@ -8,7 +8,7 @@
 #
 
 INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
- -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers
+ -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
 
 ifdef APPEXTRA
 INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
@@ -26,7 +26,7 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2))
 DEPFILE = $(OBJDIR)/dep-libwavpack
 DIRS = 
 
-OUTPUT = $(OBJDIR)/libwavpack.a
+OUTPUT = $(BUILDDIR)/libwavpack.a
 
 all: $(OUTPUT)
 
@@ -35,7 +35,7 @@ $(OUTPUT): $(OBJS)
         @$(AR) ruv $@ $+ >/dev/null 2>&1
 
 $(OBJDIR)/libwavpack/%.o: $(APPSDIR)/codecs/libwavpack/%.c
-        @echo "CC $<"
+        @echo "(libwavpack) CC $<"
         @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libwavpack/ $< -o $@
 
 include $(TOOLSDIR)/make.inc