comparison NewMakefile.gmk @ 639:ecc8fda8f187

8008435: Fix new build to include jdk.Supported in ct.sym Reviewed-by: erikj
author darcy
date Tue, 19 Feb 2013 00:24:55 -0800
parents ef6adbf511cc
children 7ed0c9db6943
comparison
equal deleted inserted replaced
2:b02187e367aa 3:daa85f33be07
48 else 48 else
49 makefile_path:=$(lastword $(MAKEFILE_LIST)) 49 makefile_path:=$(lastword $(MAKEFILE_LIST))
50 endif 50 endif
51 root_dir:=$(dir $(makefile_path)) 51 root_dir:=$(dir $(makefile_path))
52 52
53 include $(root_dir)/common/makefiles/Jprt.gmk
54
55 # ... and then we can include our helper functions 53 # ... and then we can include our helper functions
56 include $(root_dir)/common/makefiles/MakeHelpers.gmk 54 include $(root_dir)/common/makefiles/MakeHelpers.gmk
57 55
58 $(eval $(call ParseLogLevel)) 56 $(eval $(call ParseLogLevel))
59 $(eval $(call ParseConfAndSpec)) 57 $(eval $(call ParseConfAndSpec))
77 $(all_phony_targets): 75 $(all_phony_targets):
78 @$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) $(VERBOSE) VERBOSE=$(VERBOSE) $@) &&) true 76 @$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) $(VERBOSE) VERBOSE=$(VERBOSE) $@) &&) true
79 77
80 endif 78 endif
81 endif 79 endif
80
81 # Include this after a potential spec file has been included so that the bundles target
82 # has access to the spec variables.
83 include $(root_dir)/common/makefiles/Jprt.gmk
82 84
83 # Here are "global" targets, i.e. targets that can be executed without specifying a single configuration. 85 # Here are "global" targets, i.e. targets that can be executed without specifying a single configuration.
84 # If you addd more global targets, please update the variable global_targets in MakeHelpers. 86 # If you addd more global targets, please update the variable global_targets in MakeHelpers.
85 87
86 help: 88 help: