make/common/Modules.gmk

*** 41,60 ****
      $(NASHORN_TOPDIR)/src \
      #
  
  # Find all modules with java sources by looking in the source dirs
  define FindJavaModules
!   $(filter-out $(JAVA_MODULES_FILTER), $(sort $(notdir \
        $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir \
        $(wildcard $(patsubst %,%/*/share/classes/*, $(ALL_TOP_SRC_DIRS)) \
            $(patsubst %,%/*/$(OPENJDK_TARGET_OS)/classes/*, $(ALL_TOP_SRC_DIRS)) \
            $(patsubst %,%/*/$(OPENJDK_TARGET_OS_TYPE)/classes/*, $(ALL_TOP_SRC_DIRS))))))))))))
  endef
  
  # Find all modules with source for the target platform.
  define FindAllModules
!   $(sort $(filter-out closed demo sample, $(notdir $(patsubst %/,%, $(dir \
        $(wildcard $(patsubst %, %/*/share, $(ALL_TOP_SRC_DIRS)) \
        $(patsubst %, %/*/$(OPENJDK_TARGET_OS), $(ALL_TOP_SRC_DIRS)) \
        $(patsubst %, %/*/$(OPENJDK_TARGET_OS_TYPE), $(ALL_TOP_SRC_DIRS))))))))
  endef
  
--- 41,61 ----
      $(NASHORN_TOPDIR)/src \
      #
  
  # Find all modules with java sources by looking in the source dirs
  define FindJavaModules
!   $(filter-out $(MODULES_FILTER), $(sort $(notdir \
        $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir \
        $(wildcard $(patsubst %,%/*/share/classes/*, $(ALL_TOP_SRC_DIRS)) \
            $(patsubst %,%/*/$(OPENJDK_TARGET_OS)/classes/*, $(ALL_TOP_SRC_DIRS)) \
            $(patsubst %,%/*/$(OPENJDK_TARGET_OS_TYPE)/classes/*, $(ALL_TOP_SRC_DIRS))))))))))))
  endef
  
  # Find all modules with source for the target platform.
  define FindAllModules
!   $(sort $(filter-out $(MODULES_FILTER) closed demo sample, \
!       $(notdir $(patsubst %/,%, $(dir \
        $(wildcard $(patsubst %, %/*/share, $(ALL_TOP_SRC_DIRS)) \
        $(patsubst %, %/*/$(OPENJDK_TARGET_OS), $(ALL_TOP_SRC_DIRS)) \
        $(patsubst %, %/*/$(OPENJDK_TARGET_OS_TYPE), $(ALL_TOP_SRC_DIRS))))))))
  endef