move target/default/target_skeleton into package/base-files, put all the default...

[openwrt.git] / openwrt / toolchain / uClibc / uclibc.mk

diff --git a/openwrt/toolchain/uClibc/uclibc.mk b/openwrt/toolchain/uClibc/uclibc.mk
index f801f3d..39e57d4 100644 (file)
--- a/openwrt/toolchain/uClibc/uclibc.mk
+++ b/openwrt/toolchain/uClibc/uclibc.mk
@@ -10,9 +10,11 @@ UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc
 UCLIBC_SOURCE:=uClibc-$(strip $(subst ",, $(BR2_USE_UCLIBC_SNAPSHOT))).tar.bz2
 #"
 UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots
+UCLIBC_VER:=PKG_VERSION:=0.${shell date +"%G%m%d"}
 else
-UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-0.9.27
-UCLIBC_SOURCE:=uClibc-0.9.27.tar.bz2
+UCLIBC_VER:=0.9.27
+UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-$(UCLIBC_VER)
+UCLIBC_SOURCE:=uClibc-$(UCLIBC_VER).tar.bz2
 UCLIBC_SITE:=http://www.uclibc.org/downloads
 endif
 
@@ -99,6 +101,7 @@ $(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
                DEVEL_PREFIX=/ \
                RUNTIME_PREFIX=/ \
                install_dev
+       echo $(UCLIBC_VER) > $(STAGING_DIR)/uclibc_version
        # Build the host utils.  Need to add an install target... - disabled
 #      $(MAKE1) -C $(UCLIBC_DIR)/utils \
 #              PREFIX=$(STAGING_DIR) \
@@ -106,23 +109,6 @@ $(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
 #              hostutils
        touch -c $(STAGING_DIR)/lib/libc.a
 
-ifneq ($(TARGET_DIR),)
-$(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/lib/libc.a
-       $(MAKE1) -C $(UCLIBC_DIR) \
-               PREFIX=$(TARGET_DIR) \
-               DEVEL_PREFIX=/usr/ \
-               RUNTIME_PREFIX=/ \
-               install_runtime
-       touch -c $(TARGET_DIR)/lib/libc.so.0
-
-$(TARGET_DIR)/usr/bin/ldd:
-       $(MAKE1) -C $(UCLIBC_DIR) $(TARGET_CONFIGURE_OPTS) \
-               PREFIX=$(TARGET_DIR) utils install_utils
-       touch -c $(TARGET_DIR)/usr/bin/ldd
-
-UCLIBC_TARGETS=$(TARGET_DIR)/lib/libc.so.0
-endif
-
 uclibc-configured: $(UCLIBC_DIR)/.configured
 
 uclibc: $(STAGING_DIR)/lib/libc.a \
@@ -139,28 +125,3 @@ uclibc-clean:
 uclibc-toolclean:
        rm -rf $(UCLIBC_DIR)
 
-uclibc-target-utils: $(TARGET_DIR)/usr/bin/ldd
-
-#############################################################
-#
-# uClibc for the target just needs its header files
-# and whatnot installed.
-#
-#############################################################
-
-$(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib/libc.a
-       $(MAKE1) -C $(UCLIBC_DIR) \
-               PREFIX=$(TARGET_DIR) \
-               DEVEL_PREFIX=/usr/ \
-               RUNTIME_PREFIX=/ \
-               install_dev
-       touch -c $(TARGET_DIR)/usr/lib/libc.a
-
-uclibc_target: gcc uclibc $(TARGET_DIR)/usr/lib/libc.a $(TARGET_DIR)/usr/bin/ldd
-
-uclibc_target-clean:
-       rm -f $(TARGET_DIR)/include
-
-uclibc_target-dirclean:
-       rm -f $(TARGET_DIR)/include
-