diff options
| author | wtc%google.com <devnull@localhost> | 2012-10-25 01:23:23 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2012-10-25 01:23:23 +0000 |
| commit | 4fd29ab31805adf72b346dd63a475fb799a60ef9 (patch) | |
| tree | c80553e1741ba919c12fd93a520b9e022b1ccfcd | |
| parent | b963a7b8b502cc5dd8275172bfd6509e675dc3de (diff) | |
| download | nss-hg-4fd29ab31805adf72b346dd63a475fb799a60ef9.tar.gz | |
Bug 794896: Remove the unused makefile target $(DIRS). The '+' is not
necessary if the command contains $(MAKE). Remove the empty string check
for $(2) in the SUBMAKE function. Remove the leading space in the third
argument to the foreach function call in LOOP_OVER_DIRS. r=glandium.
Modified Files:
README rules.mk ruleset.mk
| -rw-r--r-- | security/coreconf/README | 6 | ||||
| -rw-r--r-- | security/coreconf/rules.mk | 7 | ||||
| -rw-r--r-- | security/coreconf/ruleset.mk | 4 |
3 files changed, 3 insertions, 14 deletions
diff --git a/security/coreconf/README b/security/coreconf/README index 987a45885..4b1e410cb 100644 --- a/security/coreconf/README +++ b/security/coreconf/README @@ -457,12 +457,6 @@ OVERVIEW of "rules.mk": MISCELLANEOUS ------------- - $(DIRS):: specifies a helper method - used by $(LOOP_THROUGH_DIRS) - to recursively change - directories and invoke - $(MAKE) - %.i: build the preprocessor file associated with the makefile rule dependency: diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index 58fe77018..abeb13e24 100644 --- a/security/coreconf/rules.mk +++ b/security/coreconf/rules.mk @@ -480,11 +480,6 @@ endif %: %.sh rm -f $@; cp $< $@; chmod +x $@ -ifdef DIRS -$(DIRS):: - $(call SUBMAKE,$@) -endif - ################################################################################ # Bunch of things that extend the 'export' rule (in order): ################################################################################ @@ -954,5 +949,5 @@ $(filter $(OBJDIR)/%$(OBJ_SUFFIX),$(OBJS)): $(OBJDIR)/%$(OBJ_SUFFIX): $(DUMMY_DE # Fake targets. Always run these rules, even if a file/directory with that # name already exists. # -.PHONY: all all_platforms alltags boot clean clobber clobber_all export install libs program realclean release $(OBJDIR) $(DIRS) +.PHONY: all all_platforms alltags boot clean clobber clobber_all export install libs program realclean release $(OBJDIR) diff --git a/security/coreconf/ruleset.mk b/security/coreconf/ruleset.mk index 5653f651d..14762378b 100644 --- a/security/coreconf/ruleset.mk +++ b/security/coreconf/ruleset.mk @@ -205,12 +205,12 @@ endif ifdef DIRS define SUBMAKE +@echo "cd $2; $(MAKE) $1" -$(IGNORE_ERROR)+@$(MAKE) $(if $(2),-C $(2)) $(1) +$(IGNORE_ERROR)@$(MAKE) -C $(2) $(1) @$(CLICK_STOPWATCH) endef - LOOP_OVER_DIRS = $(foreach dir,$(DIRS), $(call SUBMAKE,$@,$(dir))) + LOOP_OVER_DIRS = $(foreach dir,$(DIRS),$(call SUBMAKE,$@,$(dir))) endif MK_RULESET = included |