equal
deleted
inserted
replaced
79 DEPS += $(call CacheFind, $(MAN_DIR)) |
79 DEPS += $(call CacheFind, $(MAN_DIR)) |
80 endif |
80 endif |
81 |
81 |
82 LEGAL_NOTICES := \ |
82 LEGAL_NOTICES := \ |
83 $(SUPPORT_OUTPUTDIR)/modules_legal/java.base \ |
83 $(SUPPORT_OUTPUTDIR)/modules_legal/java.base \ |
84 $(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)) \ |
|
85 $(call FindModuleLegalDirs, $(MODULE)) \ |
84 $(call FindModuleLegalDirs, $(MODULE)) \ |
86 # |
85 # |
87 |
86 |
88 LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES)) |
87 LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES)) |
89 DEPS += $(call CacheFind, $(LEGAL_NOTICES)) |
88 DEPS += $(call CacheFind, $(LEGAL_NOTICES)) |
104 ifneq ($(INTERIM_JMOD), true) |
103 ifneq ($(INTERIM_JMOD), true) |
105 ALL_UPGRADEABLE_MODULES := $(call FindAllUpgradeableModules) |
104 ALL_UPGRADEABLE_MODULES := $(call FindAllUpgradeableModules) |
106 DEPS += $(patsubst %, $(JMODS_DIR)/%.jmod, \ |
105 DEPS += $(patsubst %, $(JMODS_DIR)/%.jmod, \ |
107 $(filter-out java.base $(ALL_UPGRADEABLE_MODULES), $(call FindAllModules))) |
106 $(filter-out java.base $(ALL_UPGRADEABLE_MODULES), $(call FindAllModules))) |
108 |
107 |
109 EXCLUDE_PATTERN := $(strip $(subst $(SPACE),|,$(strip $(ALL_UPGRADEABLE_MODULES)))) |
108 EXCLUDE_PATTERN := $(strip $(subst $(SPACE),$$|,$(strip $(ALL_UPGRADEABLE_MODULES)))) |
110 |
109 |
111 JMOD_FLAGS += --module-path $(JMODS_DIR) \ |
110 JMOD_FLAGS += --module-path $(JMODS_DIR) \ |
112 --hash-modules '^(?!$(EXCLUDE_PATTERN))' |
111 --hash-modules '^(?!$(EXCLUDE_PATTERN)$$)' |
113 endif |
112 endif |
114 endif |
113 endif |
115 endif |
114 endif |
116 |
115 |
117 # Changes to the jmod tool itself should also trigger a rebuild of all jmods. |
116 # Changes to the jmod tool itself should also trigger a rebuild of all jmods. |