8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile

Reviewed-by: ohair, tbell
This commit is contained in:
Erik Joelsson 2012-12-28 09:51:46 +01:00
parent b9ea1c8108
commit e781e203bf

View File

@ -88,16 +88,15 @@ demos:
# 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)