20992358 clean/clobber in many components no longer deletes the build directory
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Mon, 04 May 2015 18:34:05 -0500
changeset 4252 891a844655c4
parent 4251 2bf7e2c1ca74
child 4253 d6f30e77062b
20992358 clean/clobber in many components no longer deletes the build directory
components/gnump/Makefile
components/libusb/ugen/Makefile
components/libusb/wrapper/Makefile
components/mpfr/Makefile
components/openssl/openssl-1.0.1-fips-140/Makefile
components/openssl/openssl-fips/Makefile
components/stdcxx/Makefile
make-rules/attpackagemake.mk
make-rules/configure.mk
make-rules/gem.mk
make-rules/install.rb.mk
make-rules/justmake.mk
make-rules/makemaker.mk
make-rules/prep-patch.mk
make-rules/setup.py.mk
make-rules/shared-macros.mk
--- a/components/gnump/Makefile	Mon May 04 18:32:20 2015 -0500
+++ b/components/gnump/Makefile	Mon May 04 18:34:05 2015 -0500
@@ -46,7 +46,7 @@
 
 PATCH_LEVEL = 0
 
-CLOBBER_PATHS += libgmp.pc libgmpxx.pc
+CLEAN_PATHS += libgmp.pc libgmpxx.pc
 
 CFLAGS += -features=extinl,extensions
 CFLAGS += -xustr=ascii_utf16_ushort -xcsi
--- a/components/libusb/ugen/Makefile	Mon May 04 18:32:20 2015 -0500
+++ b/components/libusb/ugen/Makefile	Mon May 04 18:34:05 2015 -0500
@@ -46,8 +46,7 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-clobber::
-	$(RM) $(SOURCE_DIR)/.prep
+CLEAN_PATHS +=	$(SOURCE_DIR)/.prep
 
 build:		$(BUILD_32_and_64)
 
--- a/components/libusb/wrapper/Makefile	Mon May 04 18:32:20 2015 -0500
+++ b/components/libusb/wrapper/Makefile	Mon May 04 18:34:05 2015 -0500
@@ -45,6 +45,8 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
+CLEAN_PATHS +=	$(SOURCE_DIR)/.prep
+
 $(BUILD_DIR)/libusb-64.pc:	src/libusb-64.pc
 	/bin/sed -e "s#MACH64#$(MACH64)#g" <$< >[email protected]
 
--- a/components/mpfr/Makefile	Mon May 04 18:32:20 2015 -0500
+++ b/components/mpfr/Makefile	Mon May 04 18:34:05 2015 -0500
@@ -43,7 +43,7 @@
 include $(WS_MAKE_RULES)/ips.mk
 include $(WS_MAKE_RULES)/lint-libraries.mk
 
-CLOBBER_PATHS += libmpfr.pc
+CLEAN_PATHS += libmpfr.pc
 PATCH_LEVEL = 0
 
 CFLAGS += -features=extinl,extensions
--- a/components/openssl/openssl-1.0.1-fips-140/Makefile	Mon May 04 18:32:20 2015 -0500
+++ b/components/openssl/openssl-1.0.1-fips-140/Makefile	Mon May 04 18:34:05 2015 -0500
@@ -48,11 +48,6 @@
 # OpenSSL FIPS directory
 OPENSSL_FIPS_DIR = $(COMPONENT_DIR)/../openssl-fips
 
-# Note that the SPARC patch above does not fit this pattern. That is intentional
-# and a reason why we can add it to the EXTRA_PATCHES variable so that we use it
-# only on SPARC.
-PATCH_PATTERN = [0-9][0-9]*.patch
-
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
--- a/components/openssl/openssl-fips/Makefile	Mon May 04 18:32:20 2015 -0500
+++ b/components/openssl/openssl-fips/Makefile	Mon May 04 18:34:05 2015 -0500
@@ -55,7 +55,7 @@
 FAKE_CC = cc
 FAKE_APPS = $(FAKE_ISALIST) $(FAKE_MAKE) $(FAKE_CC)
 
-CLOBBER_PATHS += $(FAKE_APPS)
+CLEAN_PATHS += $(FAKE_APPS)
 
 # Do not use $(PWD), it would not work if run from a different directory with
 # "gmake -C" as we do from openssl-1.0.1
--- a/components/stdcxx/Makefile	Mon May 04 18:32:20 2015 -0500
+++ b/components/stdcxx/Makefile	Mon May 04 18:34:05 2015 -0500
@@ -42,7 +42,7 @@
 
 TPNO=			9048
 
-CLOBBER_PATHS += install.sh
+CLEAN_PATHS += install.sh
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
--- a/make-rules/attpackagemake.mk	Mon May 04 18:32:20 2015 -0500
+++ b/make-rules/attpackagemake.mk	Mon May 04 18:34:05 2015 -0500
@@ -150,6 +150,3 @@
 parfait:
 	$(MAKE) PARFAIT_BUILD=yes parfait
 endif
-
-clean::
-	$(RM) -r $(BUILD_DIR) $(PROTO_DIR)
--- a/make-rules/configure.mk	Mon May 04 18:32:20 2015 -0500
+++ b/make-rules/configure.mk	Mon May 04 18:34:05 2015 -0500
@@ -195,9 +195,6 @@
 	$(MAKE) PARFAIT_BUILD=yes parfait
 endif
 
-clean::
-	$(RM) -r $(BUILD_DIR) $(PROTO_DIR)
-
 REQUIRED_PACKAGES += developer/build/autoconf
 REQUIRED_PACKAGES += developer/build/automake
 REQUIRED_PACKAGES += developer/build/gnu-make
--- a/make-rules/gem.mk	Mon May 04 18:32:20 2015 -0500
+++ b/make-rules/gem.mk	Mon May 04 18:34:05 2015 -0500
@@ -57,7 +57,4 @@
 	$(COMPONENT_POST_INSTALL_ACTION)
 	$(TOUCH) [email protected]
 
-clean::
-	$(RM) -r $(SOURCE_DIR) $(BUILD_DIR)
-
 REQUIRED_PACKAGES += runtime/ruby
--- a/make-rules/install.rb.mk	Mon May 04 18:32:20 2015 -0500
+++ b/make-rules/install.rb.mk	Mon May 04 18:34:05 2015 -0500
@@ -46,7 +46,4 @@
 	$(COMPONENT_POST_INSTALL_ACTION)
 	$(TOUCH) [email protected]
 
-clean::
-	$(RM) -r $(SOURCE_DIR) $(BUILD_DIR)
-
 REQUIRED_PACKAGES += runtime/ruby
--- a/make-rules/justmake.mk	Mon May 04 18:32:20 2015 -0500
+++ b/make-rules/justmake.mk	Mon May 04 18:34:05 2015 -0500
@@ -127,6 +127,3 @@
 parfait:
 	$(MAKE) PARFAIT_BUILD=yes parfait
 endif
-
-clean::
-	$(RM) -r $(BUILD_DIR) $(PROTO_DIR)
--- a/make-rules/makemaker.mk	Mon May 04 18:32:20 2015 -0500
+++ b/make-rules/makemaker.mk	Mon May 04 18:34:05 2015 -0500
@@ -206,9 +206,6 @@
 	$(MAKE) PARFAIT_BUILD=yes parfait
 endif
 
-clean:: 
-	$(RM) -r $(BUILD_DIR) $(PROTO_DIR)
-
 ifneq ($(findstring 5.12, $(PERL_VERSIONS)),)
 REQUIRED_PACKAGES += runtime/perl-512
 endif
--- a/make-rules/prep-patch.mk	Mon May 04 18:32:20 2015 -0500
+++ b/make-rules/prep-patch.mk	Mon May 04 18:34:05 2015 -0500
@@ -52,7 +52,6 @@
 PATCHES =	$(shell find $(PATCH_DIR) $(PARFAIT_PATCH_DIR) -type f \
 			 -name '$(PATCH_PATTERN)' 2>/dev/null | \
 				LC_COLLATE=C sort)
-PATHCES +=	$(EXTRA_PATCHES)
 
 PCH_SUFFIXES = $(patsubst .patch_%,%, $(filter-out .patch,$(suffix $(PATCHES))))
 
--- a/make-rules/setup.py.mk	Mon May 04 18:32:20 2015 -0500
+++ b/make-rules/setup.py.mk	Mon May 04 18:34:05 2015 -0500
@@ -226,9 +226,6 @@
 	$(MAKE) PARFAIT_BUILD=yes parfait
 endif
 
-clean::
-	$(RM) -r $(SOURCE_DIR) $(BUILD_DIR)
-
 # Make it easy to construct a URL for a pypi source download.  This
 # construct supports an optional call to a number from
 # NUM_EXTRA_ARCHIVES for multiple archive downloads.
--- a/make-rules/shared-macros.mk	Mon May 04 18:32:20 2015 -0500
+++ b/make-rules/shared-macros.mk	Mon May 04 18:34:05 2015 -0500
@@ -923,6 +923,9 @@
 component-hook:
 	@$(COMPONENT_HOOK)
 
+CLEAN_PATHS +=	$(BUILD_DIR)
+CLOBBER_PATHS +=	$(PROTO_DIR)
+
 #
 # Packages with tools that are required to build Userland components
 #