X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fpackage.mk;h=f51232f5034db94e3b36943b624bec2d05cee750;hb=7a315b0b5d6aa91695853a8647383876e4b49a7a;hp=26fc30c7ec40cf81eaff90c46da4ae8608db9eb6;hpb=720b99215da295a2e7b4acdef30b58bec6acedc2;p=openwrt%2Fstaging%2Fyousong.git diff --git a/include/package.mk b/include/package.mk index 26fc30c7ec..f51232f503 100644 --- a/include/package.mk +++ b/include/package.mk @@ -7,7 +7,7 @@ __package_mk:=1 -all: $(if $(DUMP),dumpinfo,compile) +all: $(if $(DUMP),dumpinfo,$(if $(CHECK),check,compile)) PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install @@ -144,9 +144,8 @@ define Build/Exports/Default endef Build/Exports=$(Build/Exports/Default) -define Build/DefaultTargets +define Build/CoreTargets $(if $(QUILT),$(Build/Quilt)) - $(if $(USE_SOURCE_DIR)$(USE_GIT_TREE),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))) $(call Build/Autoclean) download: @@ -211,15 +210,20 @@ define Build/DefaultTargets compile: $(STAMP_INSTALLED) endif - define Build/DefaultTargets - endef - prepare: $(STAMP_PREPARED) configure: $(STAMP_CONFIGURED) dist: $(STAMP_CONFIGURED) distcheck: $(STAMP_CONFIGURED) endef +define Build/DefaultTargets + $(if $(USE_SOURCE_DIR)$(USE_GIT_TREE),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))) + $(if $(DUMP),,$(Build/CoreTargets)) + + define Build/DefaultTargets + endef +endef + define Build/IncludeOverlay $(eval -include $(wildcard $(TOPDIR)/overlay/*/$(PKG_DIR_NAME).mk)) define Build/IncludeOverlay @@ -251,14 +255,14 @@ endif ) $(if $(DUMP), \ - $(Dumpinfo/Package), \ + $(if $(CHECK),,$(Dumpinfo/Package)), \ $(foreach target, \ $(if $(Package/$(1)/targets),$(Package/$(1)/targets), \ $(if $(PKG_TARGETS),$(PKG_TARGETS), ipkg) \ ), $(BuildTarget/$(target)) \ ) \ ) - $(if $(PKG_HOST_ONLY)$(DUMP),,$(call Build/DefaultTargets,$(1))) + $(if $(PKG_HOST_ONLY),,$(call Build/DefaultTargets,$(1))) endef define pkg_install_files @@ -286,7 +290,7 @@ prepare-package-install: $(PACKAGE_DIR): mkdir -p $@ - + dumpinfo: download: prepare: