# HG changeset patch
# User erikj
# Date 1339126257 25200
# Node ID ac29cc95b5c513be36272101c671312118127f07
# Parent  02c5a3575539e737a1855b31287654e843edd6da
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>

diff -r 02c5a3575539 -r ac29cc95b5c5 makefiles/Makefile
--- 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,\