From 6f297036252df477192eddf95728c9933df4d7db Mon Sep 17 00:00:00 2001 From: Ralph Hempel Date: Sun, 31 May 2009 12:01:05 +0000 Subject: [PATCH] add dist and distcheck target (to create new source balls) SVN-Revision: 16230 --- include/package-defaults.mk | 10 +++++++++- include/package.mk | 10 ++++++++++ include/subdir.mk | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 700bc5b990..1553f2f0d1 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -70,7 +70,7 @@ CONFIGURE_VARS = \ LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ CONFIGURE_PATH = . -CONFIGURE_CMD = ./configure +CONFIGURE_CMD = $(CONFIGURE_PATH)/configure replace_script=$(FIND) $(1) -name $(2) | $(XARGS) chmod u+w; $(FIND) $(1) -name $(2) | $(XARGS) -n1 cp $(SCRIPT_DIR)/$(2); @@ -117,3 +117,11 @@ define Build/Install/Default $(MAKE_INSTALL_FLAGS) \ $(1) install; endef + +define Build/Dist/Default + $(call Build/Compile/Default, DESTDIR="$(PKG_BUILD_DIR)/tmp" CC="$(TARGET_CC)" dist) +endef + +define Build/DistCheck/Default + $(call Build/Compile/Default, DESTDIR="$(PKG_BUILD_DIR)/tmp" CC="$(TARGET_CC)" distcheck) +endef diff --git a/include/package.mk b/include/package.mk index a351661428..22808654db 100644 --- a/include/package.mk +++ b/include/package.mk @@ -141,6 +141,8 @@ define Build/DefaultTargets prepare: $(STAMP_PREPARED) configure: $(STAMP_CONFIGURED) + dist: $(STAMP_CONFIGURED) + distcheck: $(STAMP_CONFIGURED) endef define BuildPackage @@ -189,6 +191,8 @@ Build/Prepare=$(call Build/Prepare/Default,) Build/Configure=$(call Build/Configure/Default,) Build/Compile=$(call Build/Compile/Default,) Build/Install=$(if $(PKG_INSTALL),$(call Build/Install/Default,)) +Build/Dist=$(call Build/Dist/Default,) +Build/DistCheck=$(call Build/DistCheck/Default,) $(PACKAGE_DIR): mkdir -p $@ @@ -213,3 +217,9 @@ clean: clean-staging FORCE $(Build/Clean) rm -f $(STAGING_DIR)/packages/$(PKG_NAME).list $(STAGING_DIR_HOST)/packages/$(PKG_NAME).list rm -rf $(PKG_BUILD_DIR) + +dist: + $(Build/Dist) + +distcheck: + $(Build/DistCheck) diff --git a/include/subdir.mk b/include/subdir.mk index be8c308205..d93d40fca7 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -5,7 +5,7 @@ # See /LICENSE for more information. # -SUBTARGETS:=clean download prepare compile install update refresh prereq +SUBTARGETS:=clean download prepare compile install update refresh prereq dist distcheck subtarget-default = $(filter-out ., \ $(if $($(1)/builddirs-$(2)),$($(1)/builddirs-$(2)), \