simplify and fix adm5120 image building, fix broken FEATURES handling

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index 06e9104..59ee670 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/host.mk
 
 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))
@@ -22,25 +22,26 @@ INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
 $(STAMP_DIR) $(TARGET_DIR):
        mkdir -p $@
 
-%-prereq: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-prereq,%,$@) prereq
+ifeq ($(QUIET),1)
+%-compile %-install: FORCE
+       $(MAKE) -j1 -C $* $(patsubst $*-%,%,$@) || { $(call MESSAGE, "*** $* $(patsubst $*-%,%,$@) failed"); false; }
 
-%-download: FORCE
-       $(MAKE) -C $(patsubst %-download,%,$@) download
-
-%-prepare: $(TARGET_DIR) FORCE
-       $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
+%-prepare %-prereq %-download %-clean: FORCE
+else
+%-prepare %-prereq %-download %-clean %-compile %-install: FORCE
+endif
+       $(MAKE) -j1 -C $* $(patsubst $*-%,%,$@)
 
-%-compile: %-prepare
-       $(MAKE) -C $(patsubst %-compile,%,$@) compile
+%-refresh %-update:
+       -$(MAKE) -C $* $(patsubst $*-%,%,$@)
+       
+%-autorefresh:
+       -$(MAKE) -C $* clean refresh QUILT=1
 
-%-install:
-       $(MAKE) -C $(patsubst %-install,%,$@) install
 
-%-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:
@@ -48,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:
@@ -57,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 \
@@ -64,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