8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
Reviewed-by: ohair, tbell
--- a/jdk/makefiles/BuildJdk.gmk Thu Dec 27 20:18:42 2012 +0100
+++ b/jdk/makefiles/BuildJdk.gmk Fri Dec 28 09:51:46 2012 +0100
@@ -88,16 +88,15 @@
# into packages, or installed.
images:
+$(MAKE) -f CreateJars.gmk
- +$(MAKE) -f Images.gmk
+ +$(MAKE) -f Images.gmk
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+ +$(MAKE) -f Bundles.gmk
+endif
overlay-images:
+$(MAKE) -f CompileLaunchers.gmk OVERLAY_IMAGES=true
+$(MAKE) -f Images.gmk overlay-images
-# Create platform specific image layouts
-bundles:
- +$(MAKE) -f Bundles.gmk
-
BINARIES:=$(notdir $(wildcard $(IMAGES_OUTPUTDIR)/j2sdk-image/bin/*))
INSTALLDIR:=openjdk-$(RELEASE)