Port kmod-gre to the new module layout

[openwrt.git] / toolchain / Makefile

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 043a119..fb54bdd 100644 (file)
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -7,10 +7,15 @@
 # Main makefile for the toolchain
 #
 include $(TOPDIR)/rules.mk
 # Main makefile for the toolchain
 #
 include $(TOPDIR)/rules.mk

-TARGETS-y:=sed kernel-headers sstrip binutils gcc uClibc ipkg-utils libnotimpl squashfs jffs2 lzma
+TARGETS-y:=sed kernel-headers sstrip
+ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
+  TARGETS-y+=binutils gcc uClibc
+endif
+TARGETS-y+=ipkg-utils libnotimpl ext2fs squashfs jffs2 lzma
+

 TARGETS-$(CONFIG_GDB) += gdb
 
 TARGETS-$(CONFIG_GDB) += gdb
 

-TARGETS_DOWNLOAD:=$(patsubst %,%-source,$(TARGETS-y))
+TARGETS_DOWNLOAD:=$(patsubst %,%-download,$(TARGETS-y))

 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS-y))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS-y))
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS-y))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS-y))
 


@@ -21,9 +26,11 @@ clean: $(TARGETS_CLEAN)
 
 kernel-headers-prepare: sed-install
 uClibc-prepare: kernel-headers-prepare sstrip-install
 
 kernel-headers-prepare: sed-install
 uClibc-prepare: kernel-headers-prepare sstrip-install

-binutils-prepare: uClibc-prepare
-gcc-prepare: binutils-install
-uClibc-compile: gcc-compile
+ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
+  binutils-prepare: uClibc-prepare
+  gcc-prepare: binutils-install
+  uClibc-compile: gcc-compile
+endif

 gcc-install: uClibc-install
 squashfs-compile: lzma-install
 
 gcc-install: uClibc-install
 squashfs-compile: lzma-install
 


@@ -41,8 +48,8 @@ $(STAGING_DIR):
 $(TOOL_BUILD_DIR):
        @mkdir -p $@
 
 $(TOOL_BUILD_DIR):
        @mkdir -p $@
 

-%-source: FORCE
-       $(MAKE) -C $(patsubst %-source,%,$@) source
+%-download: FORCE
+       $(MAKE) -C $(patsubst %-download,%,$@) download

 
 %-prepare: $(TOOLCHAIN_STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR) FORCE
        @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
 
 %-prepare: $(TOOLCHAIN_STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR) FORCE
        @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \