Add a "Rebooting ..." message to the mtd util

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index 06e9104..c3fc01c 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/host.mk
 
 all: compile
 
 
 all: compile
 

-include $(TMP_DIR)/.pkgdeps
+include $(TMP_DIR)/.packagedeps

 
 PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m))
 DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m))
 
 PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m))
 DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m))


@@ -22,25 +22,19 @@ INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
 $(STAMP_DIR) $(TARGET_DIR):
        mkdir -p $@
 
 $(STAMP_DIR) $(TARGET_DIR):
        mkdir -p $@
 

-%-prereq: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-prereq,%,$@) prereq
+ifeq ($(QUIET),1)
+%-compile %-install: FORCE
+       $(MAKE) -C $* $(patsubst $*-%,%,$@) || { $(call MESSAGE, "*** $* $(patsubst $*-%,%,$@) failed"); false; }

 
 

-%-download: FORCE
-       $(MAKE) -C $(patsubst %-download,%,$@) download
-
-%-prepare: $(TARGET_DIR) FORCE
-       $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
-
-%-compile: %-prepare
-       $(MAKE) -C $(patsubst %-compile,%,$@) compile
-
-%-install:
-       $(MAKE) -C $(patsubst %-install,%,$@) install
+%-prepare %-prereq %-download %-clean: FORCE
+else
+%-prepare %-prereq %-download %-clean %-compile %-install: FORCE
+endif
+       $(MAKE) -C $* $(patsubst $*-%,%,$@)

 
 

-%-clean: FORCE
-       $(MAKE) -C $(patsubst %-clean,%,$@) clean
+# .IGNORE: $(COMPILE_PACKAGES) 

 
 

-$(TMP_DIR)/.pkgdeps: $(TMP_DIR)/.pkginfo
+$(TMP_DIR)/.packagedeps: $(TMP_DIR)/.packageinfo

        @$(TOPDIR)/scripts/metadata.pl package_mk < $< > $@ || rm -f $@
 
 preconfig:
        @$(TOPDIR)/scripts/metadata.pl package_mk < $< > $@ || rm -f $@
 
 preconfig:


@@ -64,6 +58,9 @@ install:
                        IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \
                done || true \
        )
                        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
 
 
 index: $(PACKAGE_DIR)/Packages