X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3049bd132af7162a179c8d29f3fc068db8e84f38..d309950948b0db22a2c5e7df41713bd17dc31ae5:/package/Makefile diff --git a/package/Makefile b/package/Makefile index 17233bbbf..501b158e4 100644 --- a/package/Makefile +++ b/package/Makefile @@ -16,7 +16,7 @@ include $(TMP_DIR)/.packagedeps PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m)) DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m)) -COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-m)) +COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m)) INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y)) $(STAMP_DIR) $(TARGET_DIR): @@ -24,13 +24,20 @@ $(STAMP_DIR) $(TARGET_DIR): ifeq ($(QUIET),1) %-compile %-install: FORCE - $(MAKE) -C $* $(patsubst $*-%,%,$@) || { $(call MESSAGE, "*** $* $(patsubst $*-%,%,$@) failed"); false; } + $(MAKE) -j1 -C $* $(patsubst $*-%,%,$@) || { $(call MESSAGE, "*** $* $(patsubst $*-%,%,$@) failed"); false; } -%-prereq %-download %-clean: FORCE +%-prepare %-prereq %-download %-clean: FORCE else -%-prereq %-download %-clean %-compile %-install: FORCE +%-prepare %-prereq %-download %-clean %-compile %-install: FORCE endif - $(MAKE) -C $* $(patsubst $*-%,%,$@) + $(MAKE) -j1 -C $* $(patsubst $*-%,%,$@) + +%-refresh %-update: + -$(MAKE) -C $* $(patsubst $*-%,%,$@) + +%-autorefresh: + -$(MAKE) -C $* clean refresh QUILT=1 + # .IGNORE: $(COMPILE_PACKAGES) @@ -42,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: @@ -51,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 \ @@ -58,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 @@ -65,7 +77,7 @@ $(PACKAGE_DIR)/Packages: $(PACKAGE_DIR)/*.ipk (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages) symlinks: - ../scripts/feeds.sh $(CONFIG_SOURCE_FEEDS) + ../scripts/feeds.sh $(CONFIG_SOURCE_FEEDS) $(CONFIG_SOURCE_FEEDS_REV) ifeq ($(MAKECMDGOALS),compile) MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)