[Pkg-mozext-commits] [requestpolicy] 40/257: [fix] makefile: remove _all_ deleted files and empty dirs

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit 7f70a4de405273f03c262d84ad204df7fcdddcb4
Author: Martin Kimmerle <dev at 256k.de>
Date:   Mon Aug 10 21:48:46 2015 +0200

    [fix] makefile: remove _all_ deleted files and empty dirs
    
    Before, only "off-amo" files/dirs have been removed.
---
 Makefile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 141183c..31cf3e0 100644
--- a/Makefile
+++ b/Makefile
@@ -69,6 +69,8 @@ rp_all_files  := $(patsubst $(source_path)%,%,$(src__all_files))
 rp_jspp_files := $(patsubst $(source_path)%,%,$(src__jspp_files))
 rp_copy_files := $(patsubst $(source_path)%,%,$(src__copy_files))
 
+rp_deleted_files :=
+rp_empty_dirs :=
 
 # _____________________________________
 # vars for generating the "off-AMO" XPI
@@ -94,6 +96,8 @@ off_amo__deleted_files := $(shell find $(off_amo__build_path) -type f | \
 # empty directories. -mindepth 1 to exclude the build directory itself.
 off_amo__empty_dirs := $(shell find $(off_amo__build_path) -mindepth 1 -type d -empty)
 endif
+rp_deleted_files += $(off_amo__deleted_files)
+rp_empty_dirs += $(off_amo__empty_dirs)
 
 
 # __________________________________________
@@ -128,6 +132,8 @@ amo__deleted_files := \
 # empty directories. -mindepth 1 to exclude the build directory itself.
 amo__empty_dirs := $(shell find $(amo__build_path) -mindepth 1 -type d -empty)
 endif
+rp_deleted_files += $(amo__deleted_files)
+rp_empty_dirs += $(amo__empty_dirs)
 
 
 # ________________________________________
@@ -155,6 +161,8 @@ unit_testing__deleted_files := \
 # empty directories. -mindepth 1 to exclude the build directory itself.
 unit_testing__empty_dirs := $(shell find $(unit_testing__build_path) -mindepth 1 -type d -empty)
 endif
+rp_deleted_files += $(unit_testing__deleted_files)
+rp_empty_dirs += $(unit_testing__empty_dirs)
 
 
 # ______________________________________
@@ -424,12 +432,12 @@ clean:
 	@echo "Cleanup is done."
 
 # remove empty directories
-$(off_amo__empty_dirs): FORCE
+$(rp_empty_dirs): FORCE
 	rmdir $@
 
 # delete deleted files that still exist in the build directory.
 # this target should be forced
-$(off_amo__deleted_files): FORCE
+$(rp_deleted_files): FORCE
 	@# delete:
 	rm $@
 	@# delete parent dirs if empty:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git