[uClibc-cvs] svn commit: trunk/uClibc

[sjhill at uclibc.org]

Author: sjhill
Date: 2005-05-14 16:02:36 -0600 (Sat, 14 May 2005)
New Revision: 10326

Log:
Top-level makefile fix for OS agnosticism and set the value of TARGET_ARCH
using grep because the '.config' will not get included if we are doing
a 'clean' or other targets. This was preventing the proper cleaning up
target architecture include files.


Modified:
   trunk/uClibc/Makefile
   trunk/uClibc/Rules.mak


Changeset:
Modified: trunk/uClibc/Makefile
===================================================================
--- trunk/uClibc/Makefile	2005-05-14 00:46:18 UTC (rev 10325)
+++ trunk/uClibc/Makefile	2005-05-14 22:02:36 UTC (rev 10326)
@@ -26,7 +26,7 @@
 	defconfig allyesconfig allnoconfig clean distclean \
 	release tags TAGS
 TOPDIR=./
-include Rules.mak
+-include Rules.mak
 
 DIRS = ldso libc libcrypt libresolv libnsl libutil libm libpthread librt
 ifeq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)

Modified: trunk/uClibc/Rules.mak
===================================================================
--- trunk/uClibc/Rules.mak	2005-05-14 00:46:18 UTC (rev 10325)
+++ trunk/uClibc/Rules.mak	2005-05-14 22:02:36 UTC (rev 10326)
@@ -93,7 +93,7 @@
 	then echo "$(1)"; else echo "$(2)"; fi)
 
 # Make certain these contain a final "/", but no "//"s.
-TARGET_ARCH:=$(strip $(subst ",, $(strip $(TARGET_ARCH))))
+TARGET_ARCH:=$(shell grep -s ^TARGET_ARCH .config | sed -e 's/^TARGET_ARCH=//' -e 's/"//g')
 RUNTIME_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(RUNTIME_PREFIX))))))
 DEVEL_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(DEVEL_PREFIX))))))
 export RUNTIME_PREFIX DEVEL_PREFIX