X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=include%2Fhost-build.mk;h=75792579eb04f8cfcff430e0b30ea7dd580da107;hp=8eb49c8f44f6dce754ee321e2869acb8a0b926f5;hb=8309df7a9f092b62f020e2e5bb1c7cbc05b5dc1a;hpb=0cb88054af106fdc900020560a5fc66c17f7462a diff --git a/include/host-build.mk b/include/host-build.mk index 8eb49c8f44..75792579eb 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2009 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -80,7 +80,7 @@ define Host/Compile endef define Host/Install/Default - $(MAKE) -C $(HOST_BUILD_DIR) install + $(_SINGLE)$(MAKE) -C $(HOST_BUILD_DIR) install endef define Host/Install @@ -130,17 +130,8 @@ ifndef DUMP touch $$@ $(call Host/Exports,$(HOST_STAMP_BUILT)) - $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) - $(call Host/Compile) - touch $$@ - - $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) - $(call Host/Install) - mkdir -p $$(shell dirname $$@) - touch $$@ - ifdef Host/Install - host-install: $(HOST_STAMP_INSTALLED) + host-install: $(if $(STAMP_BUILT),$(HOST_STAMP_BUILT),$(HOST_STAMP_INSTALLED)) endif ifndef STAMP_BUILT @@ -149,8 +140,20 @@ ifndef DUMP install: host-install clean: host-clean update: host-update + + $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) + $(call Host/Compile) + touch $$@ + + $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) + $(call Host/Install) + mkdir -p $$(shell dirname $$@) + touch $$@ else - host-compile: $(HOST_STAMP_INSTALLED) + $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) + $(call Host/Compile) + $(call Host/Install) + touch $$@ endif host-prepare: $(HOST_STAMP_PREPARED) host-configure: $(HOST_STAMP_CONFIGURED)