make/bsd/makefiles/buildtree.make

changeset 4942
f36e073d56a4
parent 4879
bab5cbf74b5f
child 5109
aabf54ccedb1
     1.1 --- a/make/bsd/makefiles/buildtree.make	Fri Apr 12 12:22:59 2013 -0700
     1.2 +++ b/make/bsd/makefiles/buildtree.make	Fri Apr 12 15:53:30 2013 -0700
     1.3 @@ -19,7 +19,7 @@
     1.4  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     1.5  # or visit www.oracle.com if you need additional information or have any
     1.6  # questions.
     1.7 -#  
     1.8 +#
     1.9  #
    1.10  
    1.11  # Usage:
    1.12 @@ -46,11 +46,11 @@
    1.13  # Makefile	- for "make foo"
    1.14  # flags.make	- with macro settings
    1.15  # vm.make	- to support making "$(MAKE) -v vm.make" in makefiles
    1.16 -# adlc.make	- 
    1.17 +# adlc.make	-
    1.18  # jvmti.make	- generate JVMTI bindings from the spec (JSR-163)
    1.19  # sa.make	- generate SA jar file and natives
    1.20  # env.[ck]sh	- environment settings
    1.21 -# 
    1.22 +#
    1.23  # The makefiles are split this way so that "make foo" will run faster by not
    1.24  # having to read the dependency files for the vm.
    1.25  
    1.26 @@ -122,7 +122,7 @@
    1.27  	$(PLATFORM_DIR)/generated/jvmtifiles \
    1.28  	$(PLATFORM_DIR)/generated/dtracefiles
    1.29  
    1.30 -TARGETS      = debug fastdebug jvmg optimized product profiled
    1.31 +TARGETS      = debug fastdebug optimized product
    1.32  SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
    1.33  
    1.34  # For dependencies and recursive makes.
    1.35 @@ -186,8 +186,8 @@
    1.36  	$(QUIETLY) mkdir -p $@
    1.37  
    1.38  # Convenience macro which takes a source relative path, applies $(1) to the
    1.39 -# absolute path, and then replaces $(GAMMADIR) in the result with a 
    1.40 -# literal "$(GAMMADIR)/" suitable for inclusion in a Makefile.  
    1.41 +# absolute path, and then replaces $(GAMMADIR) in the result with a
    1.42 +# literal "$(GAMMADIR)/" suitable for inclusion in a Makefile.
    1.43  gamma-path=$(subst $(GAMMADIR),\$$(GAMMADIR),$(call $(1),$(HS_COMMON_SRC)/$(2)))
    1.44  
    1.45  # This bit is needed to enable local rebuilds.
    1.46 @@ -279,8 +279,6 @@
    1.47  	$(QUIETLY) ( \
    1.48  	$(BUILDTREE_COMMENT); \
    1.49  	echo; \
    1.50 -	[ "$(TARGET)" = profiled ] && \
    1.51 -	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/optimized.make"; \
    1.52  	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(TARGET).make"; \
    1.53  	) > $@
    1.54  
    1.55 @@ -381,7 +379,7 @@
    1.56  	$(QUIETLY) ( \
    1.57  	$(BUILDTREE_COMMENT); \
    1.58  	echo "JDK=${JAVA_HOME}"; \
    1.59 -	) > $@	   
    1.60 +	) > $@
    1.61  
    1.62  FORCE:
    1.63  

mercurial