diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/avahi/Makefile | 4 | ||||
| -rw-r--r-- | package/expat/Makefile | 8 | ||||
| -rw-r--r-- | package/nvram/Makefile | 3 | ||||
| -rw-r--r-- | package/rules.mk | 51 |
4 files changed, 50 insertions, 16 deletions
diff --git a/package/avahi/Makefile b/package/avahi/Makefile index 12b260f68..43577f89e 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -145,8 +145,8 @@ uninstall-dev: $(STAGING_DIR)/usr/lib/libavahi-core.so* \ $(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc \ -compile: install-dev -clean: uninstall-dev +compile-targets: install-dev +clean-targets: uninstall-dev mostlyclean: -$(MAKE) -C $(PKG_BUILD_DIR) clean diff --git a/package/expat/Makefile b/package/expat/Makefile index 6ad7d8552..ef9f3a9b5 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,LIBEXPAT,libexpat,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared +$(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR) ; rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ @@ -49,7 +49,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared ); touch $@ -$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.built: rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ @@ -80,8 +80,8 @@ uninstall-dev: $(STAGING_DIR)/usr/include/expat*.h \ $(STAGING_DIR)/usr/lib/libexpat.{a,so*} \ -compile: install-dev -clean: uninstall-dev +compile-targets: install-dev +clean-targets: uninstall-dev mostlyclean: make -C $(PKG_BUILD_DIR) clean diff --git a/package/nvram/Makefile b/package/nvram/Makefile index eea5a3aa0..db8c65d33 100644 --- a/package/nvram/Makefile +++ b/package/nvram/Makefile @@ -16,6 +16,9 @@ $(PKG_BUILD_DIR)/.prepared: cp -a ./src/* $(PKG_BUILD_DIR) touch $@ +$(PKG_BUILD_DIR)/.configured: + touch $@ + $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ diff --git a/package/rules.mk b/package/rules.mk index 67fad9ae3..e5d3c503d 100644 --- a/package/rules.mk +++ b/package/rules.mk @@ -6,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)) @@ -34,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) + @$(PKG_TRACE) Downloading... + $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(MAKE_TRACE) endif ifneq ($(strip $(PKG_CAT)),) @@ -53,24 +55,53 @@ endif all: compile source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.prepared +prepare: + @[ -f $(PKG_BUILD_DIR)/.prepared ] || { \ + $(PKG_TRACE) Preparing...; \ + $(MAKE) $(PKG_BUILD_DIR)/.prepared $(MAKE_TRACE); \ + } + +configure: + @[ -f $(PKG_BUILD_DIR)/.configured ] || { \ + $(PKG_TRACE) Configuring...; \ + $(MAKE) $(PKG_BUILD_DIR)/.configured $(MAKE_TRACE); \ + } + +compile-targets: compile: + @[ -f $(PKG_BUILD_DIR)/.configured ] || { \ + $(PKG_TRACE) Configuring...; \ + $(MAKE) $(PKG_BUILD_DIR)/.configured $(MAKE_TRACE); \ + } + @[ -f $(PKG_BUILD_DIR)/.built ] || { \ + $(PKG_TRACE) Compiling...; \ + $(MAKE) compile-targets $(MAKE_TRACE); \ + } + +install-targets: install: + @$(PKG_TRACE) Installing... + @$(MAKE) install-targets $(MAKE_TRACE) + mostlyclean: rebuild: - -$(MAKE) mostlyclean + $(PKG_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: prepare +$(PKG_BUILD_DIR)/.built: configure $(PACKAGE_DIR): mkdir -p $@ +clean-targets: clean: + @$(PKG_TRACE) Cleaning... + @$(MAKE) clean-targets $(MAKE_TRACE) rm -rf $(PKG_BUILD_DIR) .PHONY: all source prepare compile install clean |