From f77b88d124ea1c900f9cf5e04046939aad48bbe1 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 6 Mar 2005 03:34:52 +0000
Subject: nbd's makefile/menuconfig rewrite

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@307 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 toolchain/uClibc/Makefile  | 10 ++++++++++
 toolchain/uClibc/uclibc.mk |  8 +++-----
 2 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 toolchain/uClibc/Makefile

(limited to 'toolchain/uClibc')

diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
new file mode 100644
index 000000000..06d7487a4
--- /dev/null
+++ b/toolchain/uClibc/Makefile
@@ -0,0 +1,10 @@
+include $(TOPDIR)/rules.mk
+
+include ./uclibc.mk
+
+source: uclibc-source
+prepare: uclibc-configured
+compile: $(UCLIBC_DIR)/lib/libc.a
+install: uclibc
+	$(STRIP) $(TARGET_DIR)/lib/*.so
+clean: uclibc-clean
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 15cf6b279..eec100f83 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -11,8 +11,6 @@ UCLIBC_SOURCE:=uClibc-$(strip $(subst ",, $(BR2_USE_UCLIBC_SNAPSHOT))).tar.bz2
 #"
 UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots
 else
-# Note: 0.9.26 has known problems.  So best use a snapshot until .27 is out.
-# Anticipate the change.
 UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-0.9.27
 UCLIBC_SOURCE:=uClibc-0.9.27.tar.bz2
 UCLIBC_SITE:=http://www.uclibc.org/downloads
@@ -45,9 +43,9 @@ $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
 $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked
 	$(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(UCLIBC_DIR)/Rules.mak
 ifeq ($(BR2_ENABLE_LOCALE),y)
-	cp toolchain/uClibc/uClibc.config-locale $(UCLIBC_DIR)/.config
+	cp ./uClibc.config-locale $(UCLIBC_DIR)/.config
 else
-	cp toolchain/uClibc/uClibc.config $(UCLIBC_DIR)/.config
+	cp ./uClibc.config $(UCLIBC_DIR)/.config
 endif
 	$(SED) 's,^.*TARGET_$(UCLIBC_TARGET_ARCH).*,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \
 		$(UCLIBC_DIR)/.config
@@ -126,7 +124,7 @@ endif
 
 uclibc-configured: $(UCLIBC_DIR)/.configured
 
-uclibc: $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/lib/libc.a \
+uclibc: $(STAGING_DIR)/lib/libc.a \
 	$(UCLIBC_TARGETS)
 
 uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE)
-- 
cgit v1.2.3