make/common/Defs-modules.gmk

@@ -27,12 +27,12 @@
 # Variables for modules build
 #
 
 # jdk modules generated from make/modules/Makefile
 # - this combines one or more submodules 
-MODULES_DIR         = $(OUTPUTDIR)/modules
-ABS_MODULES_DIR     = $(ABS_OUTPUTDIR)/modules
+MODULEPATH_DIR         = $(OUTPUTDIR)/modules
+ABS_MODULEPATH_DIR     = $(ABS_OUTPUTDIR)/modules
 
 # Submodules
 # Files are copied to its own MODULE during the jdk builds
 SUBMODULES_DIR      = $(OUTPUTDIR)/submodules
 ABS_SUBMODULES_DIR  = $(ABS_OUTPUTDIR)/submodules

@@ -48,10 +48,14 @@
 
 # Temporary files
 MODULES_TEMPDIR     = $(OUTPUTDIR)/tmp/modules
 ABS_MODULES_TEMPDIR = $(ABS_OUTPUTDIR)/tmp/modules
 
+# incremental build marker file
+MODULES_UPDATE_MARKER = $(SUBMODULES_DIR)/.modules.update
+
+# Information for building platform modules
 BASE_MODULE = jdk.base
 JIGSAW_MODULE_LIB = $(ABS_OUTPUTDIR)/lib/modules
 
 # RELEASE is JDK_VERSION and -MILESTONE if MILESTONE is set
 ifneq ($(MILESTONE),fcs)

@@ -117,6 +121,10 @@
 endef
 
 define GetBaseModuleDest
 $(shell $(ECHO) $1 | $(SED) $(MODULE_PATH_PATTERN) | \
     $(NAWK) '{print "$(SUBMODULES_DIR)/base/"$$0}')
+endef
+
+define TouchModule
+$(ECHO) $(MODULE) >> $(MODULES_UPDATE_MARKER)
 endef