X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package%2FMakefile;h=799456b1ba43fa97cc7facebbaec11ca4a414ea7;hb=35317253e61385934becad42c99739ed3349a3b8;hp=7e4e97c3aad8de3e5887fa1daaeebd36b45a4b56;hpb=7d3d765935e0928a78c13571b1309f3eeed3b440;p=oweals%2Fopenwrt.git diff --git a/package/Makefile b/package/Makefile index 7e4e97c3aa..799456b1ba 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,9 +45,9 @@ 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) @@ -54,6 +57,7 @@ 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 @@ -62,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 @@ -73,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: