diff options
author | Daniel Stenberg <daniel@haxx.se> | 2007-04-20 13:47:30 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2007-04-20 13:47:30 +0000 |
commit | 76cc6f7651e719070f0d81097a180514a225b119 (patch) | |
tree | d6f74ec34b9628e8394575ec598e9e00a24f3b7d /tools/configure | |
parent | 0a1d4820e6e0db31994e60a4fd7513ed28173cc2 (diff) | |
download | rockbox-76cc6f7651e719070f0d81097a180514a225b119.tar.gz rockbox-76cc6f7651e719070f0d81097a180514a225b119.zip |
provide CPU and Manufacturer as well, and moved around the makefile somewhat
so that "make -k" still can output a rockbox-info.txt file even if the build
(partly) fails
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13219 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools/configure')
-rwxr-xr-x | tools/configure | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/tools/configure b/tools/configure index dbb008e44d..1842be71ab 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -1526,6 +1526,8 @@ sed > Makefile \ | |||
1526 | -e "s,@MEMORY@,${memory},g" \ | 1526 | -e "s,@MEMORY@,${memory},g" \ |
1527 | -e "s,@TARGET_ID@,${target_id},g" \ | 1527 | -e "s,@TARGET_ID@,${target_id},g" \ |
1528 | -e "s,@TARGET@,${target},g" \ | 1528 | -e "s,@TARGET@,${target},g" \ |
1529 | -e "s,@CPU@,${t_cpu},g" \ | ||
1530 | -e "s,@MANUFACTURER@,${t_manufacturer},g" \ | ||
1529 | -e "s,@ARCHOS@,${archos},g" \ | 1531 | -e "s,@ARCHOS@,${archos},g" \ |
1530 | -e "s,@LANGUAGE@,${language},g" \ | 1532 | -e "s,@LANGUAGE@,${language},g" \ |
1531 | -e "s,@PWD@,${pwd},g" \ | 1533 | -e "s,@PWD@,${pwd},g" \ |
@@ -1596,6 +1598,8 @@ export ARCHOSROM=@ARCHOSROM@ | |||
1596 | export FLASHFILE=@FLASHFILE@ | 1598 | export FLASHFILE=@FLASHFILE@ |
1597 | export TARGET_ID=@TARGET_ID@ | 1599 | export TARGET_ID=@TARGET_ID@ |
1598 | export TARGET=@TARGET@ | 1600 | export TARGET=@TARGET@ |
1601 | export CPU=@CPU@ | ||
1602 | export MANUFACTURER=@MANUFACTURER@ | ||
1599 | export OBJDIR=@PWD@ | 1603 | export OBJDIR=@PWD@ |
1600 | export BUILDDIR=@PWD@ | 1604 | export BUILDDIR=@PWD@ |
1601 | export LANGUAGE=@LANGUAGE@ | 1605 | export LANGUAGE=@LANGUAGE@ |
@@ -1638,14 +1642,18 @@ export MANUALDEV=@MANUALDEV@ | |||
1638 | # Do not print "Entering directory ..." | 1642 | # Do not print "Entering directory ..." |
1639 | MAKEFLAGS += --no-print-directory | 1643 | MAKEFLAGS += --no-print-directory |
1640 | 1644 | ||
1641 | .PHONY: all clean tags zip tools manual | 1645 | .PHONY: all clean tags zip tools manual bin build info |
1642 | 1646 | ||
1643 | all: tools | 1647 | all: build info |
1648 | |||
1649 | info: | ||
1650 | \$(SILENT)\$(TOOLSDIR)/mkinfo.pl \$(BUILDDIR)/rockbox-info.txt | ||
1651 | |||
1652 | build: tools | ||
1644 | @SIMUL1@ | 1653 | @SIMUL1@ |
1645 | @SIMUL2@ | 1654 | @SIMUL2@ |
1646 | \$(SILENT)\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware | 1655 | \$(SILENT)\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware |
1647 | \$(SILENT)\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@ | 1656 | \$(SILENT)\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@ |
1648 | \$(SILENT)\$(TOOLSDIR)/mkinfo.pl \$(BUILDDIR)/rockbox-info.txt | ||
1649 | 1657 | ||
1650 | bin: tools | 1658 | bin: tools |
1651 | @SIMUL1@ | 1659 | @SIMUL1@ |