add patch from #196

[openwrt.git] / target / Makefile

diff --git a/target/Makefile b/target/Makefile
index 4f9c541..e066fa9 100644 (file)
--- a/target/Makefile
+++ b/target/Makefile
@@ -1,42 +1,14 @@
 include $(TOPDIR)/rules.mk
 
-# Default target skeleton stuff, may be overridden
-TARGET_SKEL_DIR=default/target_skeleton
-
 all: install
 
-$(TARGET_DIR):
-       mkdir -p $(TARGET_DIR)
-       if [ -f "$(TARGET_SKELETON)" ] ; then \
-       zcat $(TARGET_SKELETON) | tar -C $(BUILD_DIR) -xf -; \
-       fi;
-       if [ -d "$(TARGET_SKEL_DIR)" ] ; then \
-               cp -a $(TARGET_SKEL_DIR)/* $(TARGET_DIR)/; \
-       fi;
-       mkdir -p $(TARGET_DIR)/jffs
-       mkdir -p $(TARGET_DIR)/dev
-       mkdir -p $(TARGET_DIR)/proc
-       mkdir -p $(TARGET_DIR)/tmp
-       mkdir -p $(TARGET_DIR)/lib
-       mkdir -p $(TARGET_DIR)/usr/lib
-       mkdir -p $(TARGET_DIR)/usr/bin
-       ln -sf /tmp/resolv.conf $(TARGET_DIR)/etc/resolv.conf
-       rm -rf $(TARGET_DIR)/var
-       ln -sf /tmp $(TARGET_DIR)/var
-       -find $(TARGET_DIR) -type d -name CVS | xargs rm -rf
-       -find $(TARGET_DIR) -type d -name .svn | xargs rm -rf
-
 $(BIN_DIR):
        mkdir -p $(BIN_DIR)
 
-$(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)
+linux-install: $(BIN_DIR)
 
-prepare: $(TARGET_DIR)
+prepare: linux-prepare
 compile: linux-compile
 install: image_clean linux-install
 clean: linux-clean utils-clean lzma-clean image_clean
@@ -45,14 +17,23 @@ image_clean:
        rm -f $(BIN_DIR)/openwrt-*
 
 %-clean:
+       @$(TRACE) target/$(patsubst %-clean,%,$@)-clean
        $(MAKE) -C $(patsubst %-clean,%,$@) clean
 %-prepare:
+       @$(TRACE) target/$(patsubst %-prepare,%,$@)-prepare
        $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
 %-compile: %-prepare
+       @$(TRACE) target/$(patsubst %-compile,%,$@)-compile
        $(MAKE) -C $(patsubst %-compile,%,$@) compile
 %-rebuild: 
+       @$(TRACE) target/$(patsubst %-rebuild,%,$@)-rebuild
        $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
 %-install: %-compile
+       @$(TRACE) target/$(patsubst %-install,%,$@)-install
        $(MAKE) -C $(patsubst %-install,%,$@) install
+linux-imagebuilder:
+       @$(TRACE) target/linux/imagebuilder
+       $(MAKE) -C linux imagebuilder
 
-
+linux/package/%:
+       $(MAKE) -C $(TOPDIR)/target/linux $(patsubst linux/%,%,$@)