Cleanup cross toolchain admin, split uclibc-menuconfig into same + uclibc-update...

diff --git a/Makefile b/Makefile
index 30c70d4e6e324d93f958ea01297432cbfc6a8f65..cb030252ee4ac2518f97ca4e0114c28adecda05d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -422,7 +422,7 @@ endif # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
        cp $(shell find ./target/ -name $@) .config
        -@$(MAKE) oldconfig
 
-configured: dirs host-sed kernel-headers uclibc-configured busybox-config linux26-config
+configured: dirs host-sed kernel-headers uclibc-config busybox-config linux26-config
 
 cross: $(BASE_TARGETS)
 

diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in
index c2fa75b82f228a95bc02cbf441fe61eb04825ac0..14d4e085ed6c84aed77e17485c6dfd7025f5f517 100644 (file)
--- a/target/linux/Makefile.in
+++ b/target/linux/Makefile.in
@@ -227,7 +227,7 @@ linux26-source: $(DL_DIR)/$(LINUX26_SOURCE)
 
 linux26-unpacked: $(LINUX26_DIR)/.patched
 
-linux26-config:        host-sed $(LINUX26_DIR)/.configured
+linux26-config: host-sed $(LINUX26_DIR)/.configured
 
 linux26-update:
        cp -dpf $(LINUX26_DIR)/.config $(LINUX26_KCONFIG)

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 7fcef559fc3e3c1ed5f793ea63516b67abc8f705..1dc238d21e11c7d3b7ecd2413e1ca4460fb3d122 100644 (file)
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -108,7 +108,7 @@ else
 UCLIBC_LOCALE_DATA=
 endif
 
-$(UCLIBC_DIR)/.unpacked: dirs kernel-headers host-sed $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA)
+$(UCLIBC_DIR)/.unpacked: dirs host-sed $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA)
        mkdir -p $(TOOL_BUILD_DIR)
        rm -rf $(UCLIBC_DIR)
        $(UCLIBC_CAT) $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
@@ -366,7 +366,6 @@ uclibc-menuconfig: host-sed $(UCLIBC_DIR)/.config
                RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
                HOSTCC="$(HOSTCC)" \
                menuconfig && \
-       cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE) && \
        touch -c $(UCLIBC_DIR)/.config
 
 
@@ -450,7 +449,7 @@ uclibc-oldconfig: $(UCLIBC_DIR)/.oldconfig
 uclibc-update: uclibc-config
        cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE)
 
-uclibc-configured: $(UCLIBC_DIR)/.configured
+uclibc-configured: kernel-headers $(UCLIBC_DIR)/.configured
 
 uclibc-configured-source: uclibc-source