[Pkg-mozext-commits] [requestpolicy] 04/65: [ref] Makefile: use Static Pattern Rules

[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 df7d37aaec08711d7c087f9ecbd7ce17bff2b7cf
Author: Martin Kimmerle <dev at 256k.de>
Date:   Tue Jan 5 04:54:07 2016 +0100

    [ref] Makefile: use Static Pattern Rules
    
    Use "Static Pattern Rules" instead of "Secondary Expansion".
---
 Makefile | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 4fe0c0f..fcb72c0 100644
--- a/Makefile
+++ b/Makefile
@@ -369,14 +369,11 @@ $(specific_xpi__file):
 # empty directories and deleted files from the build directory.
 $(off_amo__build_path): $(off_amo__all_files) $(off_amo__deleted_files) $(off_amo__empty_dirs)
 
-# enable Secondary Expansion (so that $@ can be used in prerequisites via $$@)
-.SECONDEXPANSION:
-
-$(off_amo__jspp_files): $$(patsubst $$(off_amo__build_path)%,$$(source_path)%,$$@) | preprocessor
+$(off_amo__jspp_files) : $(off_amo__build_path)% : $(source_path)% | preprocessor
 	@mkdir -p $(@D)
 	$(PREPROCESS) $< > $@
 
-$(off_amo__copy_files): $$(patsubst $$(off_amo__build_path)%,$$(source_path)%,$$@)
+$(off_amo__copy_files) : $(off_amo__build_path)% : $(source_path)%
 	@mkdir -p $(@D)
 	@# Use `--dereference` to copy the files instead of the symlinks.
 	cp --dereference $< $@
@@ -397,11 +394,11 @@ $(off_amo__build_path)/META-INF/: $(off_amo__build_path) $(off_amo__all_files)
 
 $(amo__build_path): $(amo__all_files) $(amo__deleted_files) $(amo__empty_dirs)
 
-$(amo__jspp_files): $$(patsubst $$(amo__build_path)%,$$(source_path)%,$$@) | preprocessor
+$(amo__jspp_files) : $(amo__build_path)% : $(source_path)% | preprocessor
 	@mkdir -p $(@D)
 	$(PREPROCESS) -D AMO $< > $@
 
-$(amo__copy_files): $$(patsubst $$(amo__build_path)%,$$(source_path)%,$$@)
+$(amo__copy_files) : $(amo__build_path)% : $(source_path)%
 	@mkdir -p $(@D)
 	cp --dereference $< $@
 
@@ -416,11 +413,11 @@ $(amo__copy_files): $$(patsubst $$(amo__build_path)%,$$(source_path)%,$$@)
 
 $(unit_testing__build_path): $(unit_testing__all_files) $(unit_testing__deleted_files) $(unit_testing__empty_dirs)
 
-$(unit_testing__jspp_files): $$(patsubst $$(unit_testing__build_path)%,$$(source_path)%,$$@) | preprocessor
+$(unit_testing__jspp_files) : $(unit_testing__build_path)% : $(source_path)% | preprocessor
 	@mkdir -p $(@D)
 	$(PREPROCESS) --keep-lines -D UNIT_TESTING $< > $@
 
-$(unit_testing__copy_files): $$(patsubst $$(unit_testing__build_path)%,$$(source_path)%,$$@)
+$(unit_testing__copy_files) : $(unit_testing__build_path)% : $(source_path)%
 	@mkdir -p $(@D)
 	cp --dereference $< $@
 

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