summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2005-05-07 22:41:17 +0000
committerDaniel Stenberg <daniel@haxx.se>2005-05-07 22:41:17 +0000
commitb8a23f9e4980e6a041d750c325ab2845aea8488a (patch)
treed10400e99208595638f13e7fe3b279274a173e56 /tools
parentd23afcd4f4ad72b1c2c087055a9ba4457f2646cd (diff)
downloadrockbox-b8a23f9e4980e6a041d750c325ab2845aea8488a.tar.gz
rockbox-b8a23f9e4980e6a041d750c325ab2845aea8488a.zip
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
Diffstat (limited to 'tools')
-rwxr-xr-xtools/configure18
-rw-r--r--tools/make.inc1
2 files changed, 13 insertions, 6 deletions
diff --git a/tools/configure b/tools/configure
index aecdda4b14..34d80328b9 100755
--- a/tools/configure
+++ b/tools/configure
@@ -589,8 +589,14 @@ fi
sed > autoconf.h \
-e "s,@ENDIAN@,${defendian},g" \
<<EOF
+/* This header was made by configure */
+#ifndef __BUILD_AUTOCONF_H
+#define __BUILD_AUTOCONF_H
+
/* Define endianess for the target or simulator platform */
#define @ENDIAN@ 1
+
+#endif /* __BUILD_AUTOCONF_H */
EOF
sed > Makefile \
@@ -641,7 +647,7 @@ export ARCHOSROM=@ARCHOSROM@
export FLASHFILE=@FLASHFILE@
export TARGET=@TARGET@
export OBJDIR=@PWD@
-export BUILDDIR=\$(OBJDIR)
+export BUILDDIR=@PWD@
export LANGUAGE=@LANGUAGE@
export MEMORYSIZE=@MEMORY@
export VERSION=\$(shell date +%y%m%d-%H%M)
@@ -675,13 +681,13 @@ MAKEFLAGS += --no-print-directory
.PHONY: all clean tags zip
all:
- @\$(MAKE) -C \$(FIRMDIR)
- @\$(MAKE) -C \$(APPSDIR)
+ @\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware
+ @\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/apps
clean:
- @\$(MAKE) -C \$(FIRMDIR) clean
- @\$(MAKE) -C \$(APPSDIR) clean
- @rm -f rockbox.zip TAGS
+ @\$(MAKE) -C \$(FIRMDIR) clean OBJDIR=\$(BUILDDIR)/firmware
+ @\$(MAKE) -C \$(APPSDIR) clean OBJDIR=\$(BUILDDIR)/apps
+ @rm -rf rockbox.zip TAGS apps firmware comsim sim
tags:
@rm -f TAGS
diff --git a/tools/make.inc b/tools/make.inc
index 9e6600f77a..ea9815b6d2 100644
--- a/tools/make.inc
+++ b/tools/make.inc
@@ -17,6 +17,7 @@ $(OBJDIR)/%.o: %.S
# the lame echo stuff down here is to prevent any compiler errors/warnings
# to cause an error code to get returned and thus stop the build
$(DEPFILE): $(SOURCES)
+ $(SILENT)mkdir -p `dirname $(DEPFILE)`
$(SILENT)rm -f $(DEPFILE)
$(SILENT)(for each in $(SOURCES) x; do \
if test "x" != "$$each"; then \