remove two ip6t modules on linux 2.4, because they're causing conflicts with ipv4...

[openwrt.git] / target / Makefile

diff --git a/target/Makefile b/target/Makefile
index 4853e3f..3d36d26 100644 (file)
--- a/target/Makefile
+++ b/target/Makefile
@@ -1,56 +1,21 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/target.mk
+curdir:=target
 
-all: install
+$(curdir)/builddirs:=linux sdk imagebuilder
+$(curdir)/builddirs-default:=linux
+$(curdir)/builddirs-install:=linux $(if $(CONFIG_SDK),sdk) $(if $(CONFIG_IB),imagebuilder)
 
-$(BIN_DIR):
-       mkdir -p $(BIN_DIR)
+$(curdir)/imagebuilder/prepare:=$(curdir)/linux/install
 
-linux-install: $(BIN_DIR)
-image_install: linux-install
+$(eval $(call stampfile,$(curdir),target,prereq,.config))
+$(eval $(call stampfile,$(curdir),target,compile,$(TMP_DIR)/.build))
+$(eval $(call stampfile,$(curdir),target,install,$(TMP_DIR)/.build))
 
-IMAGE_DIR:=linux/$(BOARD)-$(KERNEL)/image
-
-download: $(patsubst %,%-download,$(TARGETS-y))
-prepare: linux-prepare
-compile: linux-compile image_compile
-install: image_clean linux-install sdk_install image_install imagebuilder_install
-clean: linux-clean sdk-clean imagebuilder-clean image_clean
-
-prereq: FORCE
-       $(MAKE) -C linux/$(BOARD)-$(KERNEL) prereq
-       $(MAKE) -C $(IMAGE_DIR) prereq
-
-sdk_install: FORCE
-       $(MAKE) -C sdk install
-
-image_clean: FORCE
-       $(MAKE) -C $(IMAGE_DIR) clean
-       rm -f $(BIN_DIR)/openwrt-*
-       
-image_compile: FORCE
-       $(MAKE) -C $(IMAGE_DIR) compile
-
-image_install: image_compile
-       $(MAKE) -C $(IMAGE_DIR) install
-
-imagebuilder_install: image_install
-       $(MAKE) -C imagebuilder install
-
-%-clean: FORCE
-       $(MAKE) -C $(patsubst %-clean,%,$@) clean
-%-download: FORCE
-       $(MAKE) -C $(patsubst %-download,%,$@) download
-%-prepare: FORCE
-       $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
-%-compile: %-prepare
-       $(MAKE) -C $(patsubst %-compile,%,$@) compile
-%-install: %-compile
-       $(MAKE) -C $(patsubst %-install,%,$@) install
+$($(curdir)/stamp-install): $($(curdir)/stamp-compile) 
 
+$(eval $(call subdir,$(curdir)))