package/refresh should clean all packages before refreshing their patches

[openwrt/svn-archive/archive.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index 9b8f872924f823d7d38fba382d6de32848e2791b..d6af3f28f79b20ce33c6410608fedaa633638171 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -22,12 +22,24 @@ INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
 $(STAMP_DIR) $(TARGET_DIR):
        mkdir -p $@
 
-%-prereq %-download %-clean %-compile %-install: FORCE
+ifeq ($(QUIET),1)
+%-compile %-install: FORCE
+       $(MAKE) -C $* $(patsubst $*-%,%,$@) || { $(call MESSAGE, "*** $* $(patsubst $*-%,%,$@) failed"); false; }
+
+%-prepare %-prereq %-download %-clean: FORCE
+else
+%-prepare %-prereq %-download %-clean %-compile %-install: FORCE
+endif
        $(MAKE) -C $* $(patsubst $*-%,%,$@)
 
-%-prereq: $(STAMP_DIR) $(TARGET_DIR)
-%-prepare: $(TARGET_DIR)
-%-compile: %-prepare
+%-refresh %-update:
+       -$(MAKE) -C $* $(patsubst $*-%,%,$@)
+       
+%-autorefresh:
+       -$(MAKE) -C $* clean refresh QUILT=1
+
+
+# .IGNORE: $(COMPILE_PACKAGES) 
 
 $(TMP_DIR)/.packagedeps: $(TMP_DIR)/.packageinfo
        @$(TOPDIR)/scripts/metadata.pl package_mk < $< > $@ || rm -f $@
@@ -37,6 +49,7 @@ clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
 prereq: $(PREREQ_PACKAGES)
 download: $(DOWNLOAD_PACKAGES)
 compile: $(COMPILE_PACKAGES)
+refresh: $(patsubst %,%-autorefresh,$(package-y) $(package-m) $(package-))
 
 install-targets: $(INSTALL_PACKAGES)
 install:
@@ -46,6 +59,7 @@ install:
        @if [ -d $(TOPDIR)/files ]; then \
                $(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \
        fi
+       @mkdir -p $(BUILD_DIR)/root/etc/rc.d
        @( \
                cd $(BUILD_DIR)/root; \
                for script in ./etc/init.d/*; do \
@@ -53,6 +67,9 @@ install:
                        IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \
                done || true \
        )
+       @-find $(BUILD_DIR)/root -name CVS   | $(XARGS) rm -rf
+       @-find $(BUILD_DIR)/root -name .svn  | $(XARGS) rm -rf
+       @-find $(BUILD_DIR)/root -name '.#*' | $(XARGS) rm -f
 
 index: $(PACKAGE_DIR)/Packages