From 76cc6f7651e719070f0d81097a180514a225b119 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 20 Apr 2007 13:47:30 +0000 Subject: 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 --- tools/configure | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'tools/configure') diff --git a/tools/configure b/tools/configure index dbb008e44d..1842be71ab 100755 --- a/tools/configure +++ b/tools/configure @@ -1526,6 +1526,8 @@ sed > Makefile \ -e "s,@MEMORY@,${memory},g" \ -e "s,@TARGET_ID@,${target_id},g" \ -e "s,@TARGET@,${target},g" \ + -e "s,@CPU@,${t_cpu},g" \ + -e "s,@MANUFACTURER@,${t_manufacturer},g" \ -e "s,@ARCHOS@,${archos},g" \ -e "s,@LANGUAGE@,${language},g" \ -e "s,@PWD@,${pwd},g" \ @@ -1596,6 +1598,8 @@ export ARCHOSROM=@ARCHOSROM@ export FLASHFILE=@FLASHFILE@ export TARGET_ID=@TARGET_ID@ export TARGET=@TARGET@ +export CPU=@CPU@ +export MANUFACTURER=@MANUFACTURER@ export OBJDIR=@PWD@ export BUILDDIR=@PWD@ export LANGUAGE=@LANGUAGE@ @@ -1638,14 +1642,18 @@ export MANUALDEV=@MANUALDEV@ # Do not print "Entering directory ..." MAKEFLAGS += --no-print-directory -.PHONY: all clean tags zip tools manual +.PHONY: all clean tags zip tools manual bin build info -all: tools +all: build info + +info: + \$(SILENT)\$(TOOLSDIR)/mkinfo.pl \$(BUILDDIR)/rockbox-info.txt + +build: tools @SIMUL1@ @SIMUL2@ \$(SILENT)\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware \$(SILENT)\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@ - \$(SILENT)\$(TOOLSDIR)/mkinfo.pl \$(BUILDDIR)/rockbox-info.txt bin: tools @SIMUL1@ -- cgit v1.2.3