From b8a23f9e4980e6a041d750c325ab2845aea8488a Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Sat, 7 May 2005 22:41:17 +0000
Subject: 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
---
 firmware/Makefile        | 19 ++++++++-----------
 firmware/export/config.h |  2 ++
 firmware/export/system.h |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'firmware')

diff --git a/firmware/Makefile b/firmware/Makefile
index a858edfe7c..7211b3775f 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -7,7 +7,7 @@
 # $Id$
 #
 
-INCLUDES=-Iinclude -I$(FIRMDIR) -Iexport -Icommon -Idrivers
+INCLUDES=-Iinclude -I$(FIRMDIR) -Iexport -Icommon -Idrivers -I$(BUILDDIR)
 
 CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE}
 
@@ -18,18 +18,15 @@ SOURCES = $(SRC)
 OBJS2 := $(patsubst %.c, $(OBJDIR)/%.o, $(SRC)) $(OBJDIR)/sysfont.o
 OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2))
 DIRS:=. drivers common
-OUTPUT = $(OBJDIR)/librockbox.a
+OUTPUT = $(BUILDDIR)/librockbox.a
 DEPFILE = $(OBJDIR)/dep-firmware
 
-all: $(TOOLSDIR)/convbdf $(OUTPUT) $(EXTRA_TARGETS)
+all: $(OUTPUT) $(EXTRA_TARGETS)
 
 dep: $(DEPFILE)
 
-$(TOOLSDIR)/convbdf:
-	$(MAKE) CC=gcc LD=ld -C $(TOOLSDIR)
-
 $(OUTPUT): $(OBJS) $(DEPFILE)
-	@echo "AR $@"
+	@echo "AR+RANLIB $@"
 	@$(AR) ruv $@ $(OBJS) >/dev/null 2>&1
 	@$(RANLIB) $@
 
@@ -42,13 +39,13 @@ clean:
 
 # Special targets
 $(OBJDIR)/thread.o: thread.c export/thread.h
-	@echo "CC thread.c"
-	@$(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@
+	$(SILENT)echo "CC thread.c"
+	$(SILENT)$(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@
 
 $(OBJDIR)/sysfont.o: fonts/clR6x8.bdf
 	@echo "CONVBDF"
-	@$(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $<
+	$(SILENT)$(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $<
 	@echo "CC sysfont.c"
-	@$(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@
+	$(SILENT)$(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@
 
 -include $(DEPFILE)
diff --git a/firmware/export/config.h b/firmware/export/config.h
index a47581afc7..a7ef70f24d 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -20,6 +20,8 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
+#include "autoconf.h"
+
 /* symbolic names for multiple choice configurations: */
 
 /* CONFIG_TUNER (note these are combineable bit-flags) */
diff --git a/firmware/export/system.h b/firmware/export/system.h
index 1876bc3aaa..bc54be3e1c 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -51,7 +51,7 @@ void cpu_boost(bool on_off);
 #define MAX(a, b) (((a)>(b))?(a):(b))
 #endif
 
-#ifdef LITTLE_ENDIAN
+#ifdef ROCKBOX_LITTLE_ENDIAN
 #define SWAB16(x) (x)
 #define SWAB32(x) (x)
 #endif
-- 
cgit v1.2.3