X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/3e032c51feb1678d9fe2ff1c5570135f3da40da4..91c71dd9accc12d164a95814276f2f05f1b28a5a:/package/Makefile diff --git a/package/Makefile b/package/Makefile index ff7075d41..799456b1b 100644 --- a/package/Makefile +++ b/package/Makefile @@ -8,9 +8,12 @@ include $(TOPDIR)/rules.mk include $(TOPDIR)/.config -include $(TMP_DIR)/.pkgdeps include $(INCLUDE_DIR)/host.mk +all: compile + +include $(TMP_DIR)/.pkgdeps + PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m)) DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m)) COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m)) @@ -22,19 +25,19 @@ $(STAMP_DIR) $(TARGET_DIR): %-prereq: $(STAMP_DIR) $(TARGET_DIR) $(MAKE) -C $(patsubst %-prereq,%,$@) prereq -%-download: $(STAMP_DIR) $(TARGET_DIR) +%-download: FORCE $(MAKE) -C $(patsubst %-download,%,$@) download -%-prepare: $(STAMP_DIR) $(TARGET_DIR) +%-prepare: $(TARGET_DIR) FORCE $(MAKE) -C $(patsubst %-prepare,%,$@) prepare -%-compile: $(STAMP_DIR) $(TARGET_DIR) +%-compile: %-prepare $(MAKE) -C $(patsubst %-compile,%,$@) compile -%-install: $(STAMP_DIR) $(TARGET_DIR) +%-install: $(MAKE) -C $(patsubst %-install,%,$@) install -%-clean: $(STAMP_DIR) $(TARGET_DIR) +%-clean: FORCE $(MAKE) -C $(patsubst %-clean,%,$@) clean ifeq ($(SDK),1) @@ -42,20 +45,19 @@ GENDEP_OPTS := -s endif $(TMP_DIR)/.pkgdeps: $(TMP_DIR)/.pkginfo - @$(TOPDIR)/scripts/gen_deps.pl $(GENDEP_OPTS) < $< > $@ || rm -f $@ + @$(TOPDIR)/scripts/metadata.pl package_mk $(GENDEP_OPTS) < $< > $@ || rm -f $@ -all: compile +preconfig: clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m)) prereq: $(PREREQ_PACKAGES) download: $(DOWNLOAD_PACKAGES) -compile-targets: $(COMPILE_PACKAGES) -compile: - $(MAKE) compile-targets +compile: $(COMPILE_PACKAGES) install-targets: $(INSTALL_PACKAGES) install: rm -rf $(BUILD_DIR)/root $(MAKE) install-targets + $(MAKE) preconfig @if [ -d $(TOPDIR)/files ]; then \ $(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \ fi @@ -64,7 +66,7 @@ install: for script in ./etc/init.d/*; do \ grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \ IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \ - done; \ + done || true \ ) index: $(PACKAGE_DIR)/Packages @@ -75,7 +77,7 @@ $(PACKAGE_DIR)/Packages: $(PACKAGE_DIR)/*.ipk symlinks: ../scripts/feeds.sh $(CONFIG_SOURCE_FEEDS) -ifeq ($(MAKECMDGOALS),compile-targets) +ifeq ($(MAKECMDGOALS),compile) MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL) else .NOTPARALLEL: