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

3 files changed, 11 insertions, 7 deletions

diff --git a/uisimulator/common/Makefile b/uisimulator/common/Makefile
index 62a124ac97..e4f3dd93c2 100644
--- a/uisimulator/common/Makefile
+++ b/uisimulator/common/Makefile
@@ -23,7 +23,8 @@ RM = rm -f
 DEBUG = -g
 
 # Use this for simulator-only files
-INCLUDES = -I. -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR) -I$(ROOTDIR)/uisimulator/$(SIMVER)
+INCLUDES = -I. -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR)     \
+-I$(ROOTDIR)/uisimulator/$(SIMVER) -I$(BUILDDIR)
 
 # This sets up 'SRC' based on the files mentioned in SOURCES
 include $(TOOLSDIR)/makesrc.inc
@@ -39,7 +40,7 @@ DIRS = .
 
 CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) $(GCCOPTS)
 
-OUTFILE = $(OBJDIR)/libcomsim.a
+OUTFILE = $(BUILDDIR)/libcomsim.a
 
 all: $(OUTFILE)
 
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile
index f04a54bdd4..1921e54ca3 100644
--- a/uisimulator/win32/Makefile
+++ b/uisimulator/win32/Makefile
@@ -24,7 +24,8 @@ DEPFILE = $(OBJDIR)/dep-simwin
 RM = rm -f
 DEBUG = -g
 
-INCLUDES = -I. -I$(SIMCOMMON) -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR)
+INCLUDES = -I. -I$(SIMCOMMON) -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR) \
+ -I$(BUILDDIR)
 
 DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \
 $(TARGET) -DAPPSVERSION=\"$(VERSION)\" -DMEM=${MEMORYSIZE} $(EXTRA_DEFINES)
@@ -39,7 +40,7 @@ DIRS = .
 
 CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall -mno-cygwin
 
-OUTFILE = $(OBJDIR)/libsim.a
+OUTFILE = $(BUILDDIR)/libsim.a
 
 all: $(OUTFILE)
         @echo "MAKE in common sim"
@@ -62,7 +63,8 @@ $(OBJDIR)/UI256.bmp: UI-$(ARCHOS).bmp
         @cp $< $@
 
 $(OBJDIR)/uisw32-res.o: uisw32.rc $(OBJDIR)/UI256.bmp
-        $(WINDRES) --include-dir $(OBJDIR) -i $< -o $@
+        @echo "WINDRES"
+        @$(WINDRES) --include-dir $(OBJDIR) -i $< -o $@
 
 include $(TOOLSDIR)/make.inc
 
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index f032c664be..4d3e1e7fce 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -25,7 +25,8 @@ RM = rm -f
 DEBUG = -g
 
 # Use this for simulator-only files
-INCLUDES = -I. -I$(SIMCOMMON) -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR)
+INCLUDES = -I. -I$(SIMCOMMON) -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR) \
+ -I$(BUILDDIR)
 
 # This sets up 'SRC' based on the files mentioned in SOURCES
 include $(TOOLSDIR)/makesrc.inc
@@ -41,7 +42,7 @@ DIRS = .
 
 CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) $(GCCOPTS)
 
-OUTFILE = $(OBJDIR)/libsim.a
+OUTFILE = $(BUILDDIR)/libsim.a
 
 all: $(OUTFILE)
         @$(MAKE) -C $(SIMCOMMON)