7170079: Adjustments to build-infra makefiles

Thu, 07 Jun 2012 20:30:57 -0700

author
erikj
date
Thu, 07 Jun 2012 20:30:57 -0700
changeset 1273
ac29cc95b5c5
parent 1264
02c5a3575539
child 1274
f8c64d835b28

7170079: Adjustments to build-infra makefiles
Reviewed-by: ohair, ohrstrom, ihse, jonas
Contributed-by: jonas <jonas.oreland@oracle.com>, erikj <erik.joelsson@oracle.com>, ihse <magnus.ihse.bursie@oracle.com>, tgranat <torbjorn.granat@oracle.com>, ykantser <yekaterina.kantserova@oracle.com>

makefiles/Makefile file | annotate | diff | comparison | revisions
     1.1 --- a/makefiles/Makefile	Fri Jun 01 14:12:35 2012 -0700
     1.2 +++ b/makefiles/Makefile	Thu Jun 07 20:30:57 2012 -0700
     1.3 @@ -23,12 +23,13 @@
     1.4  # questions.
     1.5  #
     1.6  
     1.7 +# This must be the first rule
     1.8 +default: all
     1.9 +
    1.10  include $(SPEC)
    1.11  include MakeBase.gmk
    1.12  include JavaCompilation.gmk
    1.13  
    1.14 -default: all
    1.15 -
    1.16  # The BOOT_JAVAC setup uses the bootdir compiler to compile the tools
    1.17  # and the bootstrap javac, to be run by the bootdir jvm.
    1.18  $(eval $(call SetupJavaCompiler,BOOT_JAVAC,\
    1.19 @@ -184,8 +185,7 @@
    1.20  			SETUP:=GENERATE_NEWBYTECODE,\
    1.21  			SRCS:=$(LANGTOOLS_OUTPUTDIR)/classes,\
    1.22  			SUFFIXES:=.class $(RESOURCE_SUFFIXES),\
    1.23 -			JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar,\
    1.24 -			HEADERS:=$(LANGTOOLS_OUTPUTDIR)/gensrc_headers))
    1.25 +			JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar))
    1.26  
    1.27                  $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE,\
    1.28  			SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\

mercurial