1.1 --- a/common/makefiles/MakeHelpers.gmk Thu Dec 27 20:55:53 2012 +0100
1.2 +++ b/common/makefiles/MakeHelpers.gmk Fri Dec 28 09:51:15 2012 +0100
1.3 @@ -50,7 +50,7 @@
1.4
1.5 # Global targets are possible to run either with or without a SPEC. The prototypical
1.6 # global target is "help".
1.7 -global_targets=help configure
1.8 +global_targets=help jprt% bridgeBuild
1.9
1.10 ##############################
1.11 # Functions
1.12 @@ -112,7 +112,7 @@
1.13
1.14 # Do not indent this function, this will add whitespace at the start which the caller won't handle
1.15 define GetRealTarget
1.16 -$(strip $(if $(MAKECMDGOALS),$(MAKECMDGOALS),all))
1.17 +$(strip $(if $(MAKECMDGOALS),$(MAKECMDGOALS),default))
1.18 endef
1.19
1.20 # Do not indent this function, this will add whitespace at the start which the caller won't handle
1.21 @@ -126,10 +126,7 @@
1.22 # Check if the current target is the last goal
1.23 $(if $(filter $@,$(call LastGoal)),$(call AtMakeEnd))
1.24 # If the target is 'foo-only', check if our goal was stated as 'foo'
1.25 - $(if $(filter $(patsubst %-only,%,$@),$(call LastGoal)),$(call AtMakeEnd))
1.26 - # If no goal is given, 'all' is default, but the last target executed for all is 'jdk-only'. Check for that, too.
1.27 - # At most one of the tests can be true.
1.28 - $(if $(subst all,,$(call LastGoal)),,$(if $(filter $@,jdk-only),$(call AtMakeEnd)))
1.29 + $(if $(filter $@,$(call LastGoal)-only),$(call AtMakeEnd))
1.30 endef
1.31
1.32 # Hook to be called when starting to execute a top-level target
