From 2edb29385b7005a345f9873fb5eb9544b95023b0 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Mon, 15 Sep 2014 12:23:32 -0700
Subject: [PATCH] 8058367: Add verify-modules target to the default and images
 target

Reviewed-by: alanb, erikj, ihse, prr
---
 make/Main.gmk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/make/Main.gmk b/make/Main.gmk
index 230fec4140e..aa87b6ff601 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -298,7 +298,9 @@ ALL_TARGETS += test test-make
 # Verification targets
 
 verify-modules:
+	@$(call TargetEnter)
 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f CheckModules.gmk)
+	@$(call TargetExit)
 
 ALL_TARGETS += verify-modules
 
@@ -400,7 +402,7 @@ else
     main-jars: java.security.jgss-libs
   endif
 
-  images: jars demos samples exploded-image source-tips
+  images: jars demos samples exploded-image verify-modules source-tips
 
   bootcycle-images: images
 
@@ -476,7 +478,7 @@ ALL_TARGETS += gensrc gendata copy java rmic libs launchers \
 
 ################################################################################
 
-all: images docs verify-modules
+all: images docs
 default: exploded-image
 
 ALL_TARGETS += default all