fix duplicate packaging of the ipv6 imq module

[openwrt.git] / openwrt / target / Makefile

diff --git a/openwrt/target/Makefile b/openwrt/target/Makefile
index 52b2e60..24c3403 100644 (file)
--- a/openwrt/target/Makefile
+++ b/openwrt/target/Makefile
@@ -1,8 +1,5 @@
 include $(TOPDIR)/rules.mk
 
 include $(TOPDIR)/rules.mk
 

-# Default target skeleton stuff, may be overridden
-TARGET_SKEL_DIR=default/target_skeleton
-

 all: install
 
 $(BIN_DIR):
 all: install
 
 $(BIN_DIR):


@@ -11,7 +8,7 @@ $(BIN_DIR):
 linux-compile: utils-install lzma-install
 linux-install: $(BIN_DIR)
 
 linux-compile: utils-install lzma-install
 linux-install: $(BIN_DIR)
 

-prepare: 
+prepare: linux-prepare

 compile: linux-compile
 install: image_clean linux-install
 clean: linux-clean utils-clean lzma-clean image_clean
 compile: linux-compile
 install: image_clean linux-install
 clean: linux-clean utils-clean lzma-clean image_clean


@@ -19,15 +16,26 @@ clean: linux-clean utils-clean lzma-clean image_clean
 image_clean:
        rm -f $(BIN_DIR)/openwrt-*
 
 image_clean:
        rm -f $(BIN_DIR)/openwrt-*
 

+linux/package/%:
+       $(MAKE) -C $(TOPDIR)/target/linux $(patsubst linux/%,%,$@)
+

 %-clean:
 %-clean:

+       @$(TRACE) target/$(patsubst %-clean,%,$@)-clean

        $(MAKE) -C $(patsubst %-clean,%,$@) clean
 %-prepare:
        $(MAKE) -C $(patsubst %-clean,%,$@) clean
 %-prepare:

+       @$(TRACE) target/$(patsubst %-prepare,%,$@)-prepare

        $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
 %-compile: %-prepare
        $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
 %-compile: %-prepare

+       @$(TRACE) target/$(patsubst %-compile,%,$@)-compile

        $(MAKE) -C $(patsubst %-compile,%,$@) compile
 %-rebuild: 
        $(MAKE) -C $(patsubst %-compile,%,$@) compile
 %-rebuild: 

+       @$(TRACE) target/$(patsubst %-rebuild,%,$@)-rebuild

        $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
 %-install: %-compile
        $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
 %-install: %-compile

+       @$(TRACE) target/$(patsubst %-install,%,$@)-install

        $(MAKE) -C $(patsubst %-install,%,$@) install
        $(MAKE) -C $(patsubst %-install,%,$@) install

+linux-imagebuilder:
+       @$(TRACE) target/linux/imagebuilder
+       $(MAKE) -C linux imagebuilder