Update to new upstream release (v0.1.0.11)

[openwrt.git] / openwrt / target / Makefile

diff --git a/openwrt/target/Makefile b/openwrt/target/Makefile
index c8baab5..4f9c541 100644 (file)
--- a/openwrt/target/Makefile
+++ b/openwrt/target/Makefile
@@ -5,61 +5,7 @@ TARGET_SKEL_DIR=default/target_skeleton
 
 all: install
 
-define IMAGE_template
-$(BIN_DIR)/openwrt-wrt54g-$(1).bin: $(BIN_DIR)/openwrt-generic-$(patsubst jffs2,jffs2-4MB,$(1)).trx
-       PATH=$(TARGET_PATH) addpattern -2 -i $$< -o $$@ -g
-       $(SED) "1s,^W54S,W54G," $$@
-       
-$(BIN_DIR)/openwrt-wrt54gs-$(1).bin: $(BIN_DIR)/openwrt-generic-$(patsubst jffs2,jffs2-8MB,$(1)).trx
-       PATH=$(TARGET_PATH) addpattern -2 -i $$< -o $$@ -g
-       
-ifeq ($(BR2_TARGET_WRT54G),y)
-IMAGE_TARGETS += $(BIN_DIR)/openwrt-wrt54g-$(1).bin
-endif
-ifeq ($(BR2_TARGET_WRT54GS),y)
-IMAGE_TARGETS += $(BIN_DIR)/openwrt-wrt54gs-$(1).bin
-endif
-
-
-$(BIN_DIR)/openwrt-motorola-$(1).bin: $(BIN_DIR)/openwrt-generic-$(patsubst jffs2,jffs2-8MB,$(1)).trx
-       PATH=$(TARGET_PATH) motorola-bin $$< $$@
-
-ifeq ($(BR2_TARGET_MOTOROLA),y)
-IMAGE_TARGETS += $(BIN_DIR)/openwrt-motorola-$(1).bin
-endif
-endef
-
-#  Enable loader and prepare kernel
-ifeq ($(strip $(BR2_PACKAGE_LOADER)),y)
-export LINUX_LOADER=$(BUILD_DIR)/lzmaldr
-export LINUX_IMAGE=$(BUILD_DIR)/piggy.lzma
-else
-export LINUX_IMAGE=$(BUILD_DIR)/piggy.gz
-endif
-
-$(BUILD_DIR)/piggy.lzma: $(LINUX_KERNEL)
-       cat $^ | $(BUILD_DIR)/lzma/lzma e -si -so -eos > $@ || (rm -f $@ && false)
-
-$(BUILD_DIR)/piggy.gz: $(LINUX_KERNEL)
-       cat $^ | gzip -c9 $^ > $@ || (rm -f $@ && false)
-
-TARGET_DIRS:=
-TARGET_FS:=
-IMAGE_TARGETS:=
-ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y)
-TARGET_DIRS += jffs2
-TARGET_FS += jffs2
-endif
-ifeq ($(strip $(BR2_TARGET_ROOTFS_SQUASHFS_LZMA)),y)
-TARGET_DIRS += squashfs-lzma
-TARGET_FS += squashfs
-endif
-$(foreach fs,$(TARGET_FS),$(eval $(call IMAGE_template,$(fs))))
-
-INSTALL_TARGET_DIRS:=$(patsubst %,%-install,$(TARGET_DIRS))
-$(INSTALL_TARGET_DIRS): image_clean $(TARGET_DIR)/etc/sysconf $(BIN_DIR)
-
-prepare: $(patsubst %,%-prepare,$(TARGET_DIRS))
+$(TARGET_DIR):
        mkdir -p $(TARGET_DIR)
        if [ -f "$(TARGET_SKELETON)" ] ; then \
        zcat $(TARGET_SKELETON) | tar -C $(BUILD_DIR) -xf -; \
@@ -83,23 +29,29 @@ prepare: $(patsubst %,%-prepare,$(TARGET_DIRS))
 $(BIN_DIR):
        mkdir -p $(BIN_DIR)
 
-compile: $(patsubst %,%-compile,$(TARGET_DIRS))
-install: utils-install lzma-install $(LINUX_IMAGE) $(patsubst %,%-install,$(TARGET_DIRS)) $(IMAGE_TARGETS)
-clean: $(patsubst %,%-clean,$(TARGET_DIRS)) image_clean
-
-image_clean:
-       rm -f $(BIN_DIR)/openwrt-*
-
 $(TARGET_DIR)/etc/sysconf:
        mkdir -p $(TARGET_DIR)/etc
        -grep \^BR2_SYSCONF $(TOPDIR)/.config > $(TARGET_DIR)/etc/sysconf
 
+linux-compile: utils-install lzma-install
+linux-install: $(TARGET_DIR)/etc/sysconf $(BIN_DIR)
+
+prepare: $(TARGET_DIR)
+compile: linux-compile
+install: image_clean linux-install
+clean: linux-clean utils-clean lzma-clean image_clean
+
+image_clean:
+       rm -f $(BIN_DIR)/openwrt-*
+
 %-clean:
        $(MAKE) -C $(patsubst %-clean,%,$@) clean
 %-prepare:
        $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
 %-compile: %-prepare
        $(MAKE) -C $(patsubst %-compile,%,$@) compile
+%-rebuild: 
+       $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
 %-install: %-compile
        $(MAKE) -C $(patsubst %-install,%,$@) install