X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fpackage.mk;h=3328332725a4aa1aa5913d45370d016da0850d83;hb=0280901b294214c6f02db881fbfdfccb10d6d291;hp=fbd4cf714957f524355e6a022b3d951a433a6b56;hpb=abbc6440741e747eb56f5b03d3df26df5e536864;p=openwrt-10.03%2F.git diff --git a/include/package.mk b/include/package.mk index fbd4cf714..332833272 100644 --- a/include/package.mk +++ b/include/package.mk @@ -15,17 +15,23 @@ include $(INCLUDE_DIR)/prereq.mk define Build/DefaultTargets ifeq ($(DUMP),) ifeq ($(CONFIG_AUTOREBUILD),y) + _INFO:= ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR)) + _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) $(PKG_BUILD_DIR)/.prepared: package-clean endif - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR) | tee /tmp/check_$(1)),$(IPKG_$(1))) + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1))) + _INFO+=$(subst $(TOPDIR)/,,$(IPKG_$(1))) $(PKG_BUILD_DIR)/.built: package-rebuild endif + + ifneq ($(MAKECMDGOALS),prereq) + $$(info Rebuilding $$(_INFO)) + endif endif endif - $(PKG_BUILD_DIR)/.prepared: @-rm -rf $(PKG_BUILD_DIR) @mkdir -p $(PKG_BUILD_DIR) @@ -121,7 +127,7 @@ define BuildPackage install-targets: $$(INFO_$(1)) endif - ifneq ($(CONFIG_PACKAGE_$(1))$(CONFIG_ALL),) + ifneq ($(CONFIG_PACKAGE_$(1)),) compile-targets: $$(IPKG_$(1)) endif endif @@ -252,11 +258,11 @@ endef define Build/Configure/Default @(cd $(PKG_BUILD_DIR)/$(3); \ [ -x configure ] && \ - $(2) \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ + $(2) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ @@ -286,7 +292,6 @@ endef define Build/Compile/Default $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - CC=$(TARGET_CC) \ CROSS="$(TARGET_CROSS)" \ EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \ ARCH="$(ARCH)" \