Mercurial > hg > icedtea9-forest > langtools
changeset 1306:ac29cc95b5c5
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>
| author | erikj |
|---|---|
| date | Thu, 07 Jun 2012 20:30:57 -0700 |
| parents | 02c5a3575539 |
| children | f8c64d835b28 |
| files | makefiles/Makefile |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/makefiles/Makefile Fri Jun 01 14:12:35 2012 -0700 +++ b/makefiles/Makefile Thu Jun 07 20:30:57 2012 -0700 @@ -23,12 +23,13 @@ # questions. # +# This must be the first rule +default: all + include $(SPEC) include MakeBase.gmk include JavaCompilation.gmk -default: all - # The BOOT_JAVAC setup uses the bootdir compiler to compile the tools # and the bootstrap javac, to be run by the bootdir jvm. $(eval $(call SetupJavaCompiler,BOOT_JAVAC,\ @@ -184,8 +185,7 @@ SETUP:=GENERATE_NEWBYTECODE,\ SRCS:=$(LANGTOOLS_OUTPUTDIR)/classes,\ SUFFIXES:=.class $(RESOURCE_SUFFIXES),\ - JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar,\ - HEADERS:=$(LANGTOOLS_OUTPUTDIR)/gensrc_headers)) + JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar)) $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE,\ SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\