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>
--- a/langtools/makefiles/Makefile Wed Jul 05 18:12:32 2017 +0200
+++ b/langtools/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,\