more cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8238 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
fe5198f0ff
commit
afb0255875
|
@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package-ipkg.mk
|
||||||
|
|
||||||
export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
|
export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
|
||||||
|
|
||||||
ifeq ($(DUMP),)
|
ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
|
||||||
ifneq ($(CONFIG_AUTOREBUILD),)
|
ifneq ($(CONFIG_AUTOREBUILD),)
|
||||||
define Build/Autoclean
|
define Build/Autoclean
|
||||||
$(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED)
|
$(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED)
|
||||||
|
|
|
@ -7,8 +7,13 @@
|
||||||
|
|
||||||
SUBTARGETS:=clean download prepare compile install update refresh prereq
|
SUBTARGETS:=clean download prepare compile install update refresh prereq
|
||||||
|
|
||||||
|
subtarget-default = $(filter-out ., \
|
||||||
|
$(if $($(1)/builddirs-$(2)),$($(1)/builddirs-$(2)), \
|
||||||
|
$(if $($(1)/builddirs-default),$($(1)/builddirs-default), \
|
||||||
|
$($(1)/builddirs))))
|
||||||
|
|
||||||
define subtarget
|
define subtarget
|
||||||
$(call warn_eval,$(1),t,T,$(1)/$(2): $($(1)/) $(foreach bd,$(if $($(1)/builddirs-$(2)),$(filter-out .,$($(1)/builddirs-$(2))),$($(1)/builddirs)),$(1)/$(bd)/$(2)))
|
$(call warn_eval,$(1),t,T,$(1)/$(2): $($(1)/) $(foreach bd,$(call subtarget-default,$(1),$(2)),$(1)/$(bd)/$(2)))
|
||||||
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
|
@ -11,9 +11,9 @@ curdir:=package
|
||||||
include .config
|
include .config
|
||||||
-include $(TMP_DIR)/.packagedeps
|
-include $(TMP_DIR)/.packagedeps
|
||||||
$(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
|
$(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
|
||||||
$(curdir)/builddirs-compile:=$(sort $(package-y) $(package-m))
|
$(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
|
||||||
$(curdir)/builddirs-install:=. $(sort $(package-y))
|
|
||||||
$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
|
$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
|
||||||
|
$(curdir)/builddirs-install:=. $(sort $(package-y))
|
||||||
|
|
||||||
$(curdir)//compile:=.config prereq
|
$(curdir)//compile:=.config prereq
|
||||||
$(curdir)/install:=$(curdir)/install-cleanup
|
$(curdir)/install:=$(curdir)/install-cleanup
|
||||||
|
|
Loading…
Reference in New Issue