make/CreateJmods.gmk
changeset 50142 f348e5d4769b
parent 49566 7c224ec572d0
child 50149 d93ae85b18c1
equal deleted inserted replaced
50141:8a7d677ad039 50142:f348e5d4769b
    37 ################################################################################
    37 ################################################################################
    38 
    38 
    39 JMODS_DIR := $(IMAGES_OUTPUTDIR)/jmods
    39 JMODS_DIR := $(IMAGES_OUTPUTDIR)/jmods
    40 JMODS_TEMPDIR := $(SUPPORT_OUTPUTDIR)/jmods
    40 JMODS_TEMPDIR := $(SUPPORT_OUTPUTDIR)/jmods
    41 
    41 
    42 LIBS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \
    42 LIBS_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \
    43     $(SUPPORT_OUTPUTDIR)/modules_libs $(IMPORT_MODULES_LIBS))))
    43     $(SUPPORT_OUTPUTDIR)/modules_libs $(IMPORT_MODULES_LIBS))))
    44 CMDS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \
    44 CMDS_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \
    45     $(SUPPORT_OUTPUTDIR)/modules_cmds $(IMPORT_MODULES_CMDS))))
    45     $(SUPPORT_OUTPUTDIR)/modules_cmds $(IMPORT_MODULES_CMDS))))
    46 CONF_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \
    46 CONF_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \
    47     $(SUPPORT_OUTPUTDIR)/modules_conf $(IMPORT_MODULES_CONF))))
    47     $(SUPPORT_OUTPUTDIR)/modules_conf $(IMPORT_MODULES_CONF))))
    48 CLASSES_DIR := $(wildcard $(JDK_OUTPUTDIR)/modules/$(MODULE))
    48 CLASSES_DIR ?= $(wildcard $(JDK_OUTPUTDIR)/modules/$(MODULE))
    49 INCLUDE_HEADERS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \
    49 INCLUDE_HEADERS_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \
    50     $(SUPPORT_OUTPUTDIR)/modules_include $(IMPORT_MODULES_INCLUDE_HEADERS))))
    50     $(SUPPORT_OUTPUTDIR)/modules_include $(IMPORT_MODULES_INCLUDE_HEADERS))))
    51 MAN_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \
    51 MAN_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \
    52     $(SUPPORT_OUTPUTDIR)/modules_man $(IMPORT_MODULES_MAN))))
    52     $(SUPPORT_OUTPUTDIR)/modules_man $(IMPORT_MODULES_MAN))))
    53 
    53 
    54 $(eval $(call FillCacheFind, \
    54 $(eval $(call FillCacheFind, \
    55     $(LIBS_DIR) $(CMDS_DIR) $(CONF_DIR) $(CLASSES_DIR) \
    55     $(LIBS_DIR) $(CMDS_DIR) $(CONF_DIR) $(CLASSES_DIR) \
    56 ))
    56 ))