X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b401d50c8b3b367ea61af8fdf2ce44440a51a3a8..c24381f99e7ff26ab84c065a5b87ef358e5a7de8:/openwrt/package/rules.mk diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk index f7b81c62a..18f53bdc3 100644 --- a/openwrt/package/rules.mk +++ b/openwrt/package/rules.mk @@ -1,6 +1,4 @@ # invoke ipkg with configuration in $(STAGING_DIR)/etc/ipkg.conf -IPKG := IPKG_INSTROOT=$(TARGET_DIR) IPKG_CONF_DIR=$(IPKG_CONF) $(SCRIPT_DIR)/ipkg -force-defaults -force-depends -IPKG_STATE_DIR := $(TARGET_DIR)/usr/lib/ipkg define PKG_template IPKG_$(1):=$(PACKAGE_DIR)/$(2)_$(3)_$(4).ipk @@ -8,13 +6,13 @@ IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(2) INFO_$(1):=$(IPKG_STATE_DIR)/info/$(2).list ifneq ($(BR2_PACKAGE_$(1)),) -compile: $$(IPKG_$(1)) +compile-targets: $$(IPKG_$(1)) endif ifneq ($(DEVELOPER),) -compile: $$(IPKG_$(1)) +compile-targets: $$(IPKG_$(1)) endif ifeq ($(BR2_PACKAGE_$(1)),y) -install: $$(INFO_$(1)) +install-targets: $$(INFO_$(1)) endif IDEPEND_$(1):=$$(strip $(5)) @@ -36,9 +34,11 @@ $(2)-clean: clean: $(2)-clean endef + ifneq ($(strip $(PKG_SOURCE)),) $(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) + @$(CMD_TRACE) "downloading... " + $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(MAKE_TRACE) endif ifneq ($(strip $(PKG_CAT)),) @@ -55,24 +55,47 @@ endif all: compile source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.prepared -compile: +prepare: source + @[ -f $(PKG_BUILD_DIR)/.prepared ] || { \ + $(CMD_TRACE) "preparing... "; \ + $(MAKE) $(PKG_BUILD_DIR)/.prepared $(MAKE_TRACE); \ + } + +configure: prepare + @[ -f $(PKG_BUILD_DIR)/.configured ] || { \ + $(CMD_TRACE) "configuring... "; \ + $(MAKE) $(PKG_BUILD_DIR)/.configured $(MAKE_TRACE); \ + } + +compile-targets: +compile: configure + @$(CMD_TRACE) "compiling... " + @$(MAKE) compile-targets $(MAKE_TRACE) + +install-targets: install: + @$(CMD_TRACE) "installing... " + @$(MAKE) install-targets $(MAKE_TRACE) + mostlyclean: rebuild: - -$(MAKE) mostlyclean + $(CMD_TRACE) "rebuilding... " + @-$(MAKE) mostlyclean 2>&1 >/dev/null if [ -f $(PKG_BUILD_DIR)/.built ]; then \ - $(MAKE) clean; \ + $(MAKE) clean $(MAKE_TRACE); \ fi - $(MAKE) compile + $(MAKE) compile $(MAKE_TRACE) -$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared -$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.configured: +$(PKG_BUILD_DIR)/.built: $(PACKAGE_DIR): mkdir -p $@ +clean-targets: clean: + @$(CMD_TRACE) "cleaning... " + @$(MAKE) clean-targets $(MAKE_TRACE) rm -rf $(PKG_BUILD_DIR) .PHONY: all source prepare compile install clean