move target/linux/image to target/image

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4040 3c298f89-4303-0410-b956-a3cf2f4a3e73

include/target.mk

@@ -0,0 +1,23 @@
+define kernel_template
+ifeq ($(CONFIG_LINUX_$(3)),y)
+KERNEL:=$(1)
+BOARD:=$(2)
+endif
+endef
+
+$(eval $(call kernel_template,2.4,brcm,2_4_BRCM))
+$(eval $(call kernel_template,2.4,ar7,2_4_AR7))
+$(eval $(call kernel_template,2.4,x86,2_4_X86))
+$(eval $(call kernel_template,2.6,brcm,2_6_BRCM))
+$(eval $(call kernel_template,2.6,rb532,2_6_RB532))
+$(eval $(call kernel_template,2.6,x86,2_6_X86))
+$(eval $(call kernel_template,2.4,ar531x,2_4_AR531X))
+$(eval $(call kernel_template,2.6,aruba,2_6_ARUBA))
+$(eval $(call kernel_template,2.6,au1000,2_6_AU1000))
+$(eval $(call kernel_template,2.6,xscale,2_6_XSCALE))
+$(eval $(call kernel_template,2.6,sibyte,2_6_SIBYTE))
+
+export BOARD
+export KERNEL
+
+

target/Makefile

@@ -1,4 +1,5 @@
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/target.mk
 
 all: install
 
@@ -11,16 +12,24 @@ TARGETS-$(CONFIG_SDK) += sdk
 linux-compile: utils-install
 linux-install: $(BIN_DIR)
 sdk-compile: linux-install
+image_install: linux-install
 
 download: $(patsubst %,%-source,$(TARGETS-y))
 prepare: linux-prepare
-compile: linux-compile
+compile: linux-compile image_compile
-install: image_clean $(patsubst %,%-install,$(TARGETS-y))
+install: image_clean $(patsubst %,%-install,$(TARGETS-y)) image_install
 clean: $(patsubst %,%-clean,$(TARGETS-y)) image_clean
 
 image_clean: FORCE
+	$(MAKE) -C image/$(BOARD) clean
 	rm -f $(BIN_DIR)/openwrt-*
 	
+image_compile: FORCE
+	$(MAKE) -C image/$(BOARD) compile
+
+image_install: image_compile
+	$(MAKE) -C image/$(BOARD) install
+
 %-clean: FORCE
 	$(MAKE) -C $(patsubst %-clean,%,$@) clean
 %-source: FORCE

target/linux/Makefile

@@ -1,33 +1,8 @@
 include $(TOPDIR)/rules.mk
-
+include $(INCLUDE_DIR)/target.mk
-PKG_OS:=$(shell uname -s)
-PKG_CPU:=$(shell uname -m)
-
-define kernel_template
-ifeq ($(CONFIG_LINUX_$(3)),y)
-KERNEL:=$(1)
-BOARD:=$(2)
-endif
-endef
-
-$(eval $(call kernel_template,2.4,brcm,2_4_BRCM))
-$(eval $(call kernel_template,2.4,ar7,2_4_AR7))
-$(eval $(call kernel_template,2.4,x86,2_4_X86))
-$(eval $(call kernel_template,2.6,brcm,2_6_BRCM))
-$(eval $(call kernel_template,2.6,rb532,2_6_RB532))
-$(eval $(call kernel_template,2.6,x86,2_6_X86))
-$(eval $(call kernel_template,2.4,ar531x,2_4_AR531X))
-$(eval $(call kernel_template,2.6,aruba,2_6_ARUBA))
-$(eval $(call kernel_template,2.6,au1000,2_6_AU1000))
-$(eval $(call kernel_template,2.6,xscale,2_6_XSCALE))
-$(eval $(call kernel_template,2.6,sibyte,2_6_SIBYTE))
-
-export BOARD
-export KERNEL
 
 source:
 	$(MAKE) -C $(BOARD)-$(KERNEL) source
-	$(MAKE) -C image/$(BOARD) source
 
 prepare:
 	rm -f $(TOPDIR)/.kernel.mk
@@ -38,10 +13,6 @@ compile:
 
 install:
 	$(MAKE) -C $(BOARD)-$(KERNEL) install
-	$(MAKE) -C image/$(BOARD) install
 	
 clean:
 	$(MAKE) -C $(BOARD)-$(KERNEL) clean
-
-image/%:
-	$(MAKE) -C image $(patsubst image/%,%,$@)