equal
deleted
inserted
replaced
67 build.tools.classlist.HelloClasslist \ |
67 build.tools.classlist.HelloClasslist \ |
68 $(LOG_DEBUG) 2>&1 > $(JLI_TRACE_FILE) |
68 $(LOG_DEBUG) 2>&1 > $(JLI_TRACE_FILE) |
69 |
69 |
70 # The jli trace is created by the same recipe as classlist. By declaring these |
70 # The jli trace is created by the same recipe as classlist. By declaring these |
71 # dependencies, make will correctly rebuild both jli trace and classlist |
71 # dependencies, make will correctly rebuild both jli trace and classlist |
72 # incrementally using the single recpie above. |
72 # incrementally using the single recipe above. |
73 $(CLASSLIST_FILE): $(JLI_TRACE_FILE) |
73 $(CLASSLIST_FILE): $(JLI_TRACE_FILE) |
74 $(JLI_TRACE_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXE_SUFFIX) $(CLASSLIST_JAR) |
74 $(JLI_TRACE_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXE_SUFFIX) $(CLASSLIST_JAR) |
75 |
75 |
76 TARGETS += $(CLASSLIST_FILE) $(JLI_TRACE_FILE) |
76 TARGETS += $(CLASSLIST_FILE) $(JLI_TRACE_FILE) |
77 |
77 |
87 $(eval $(call SetupCopyFiles, COPY_JLI_TRACE, \ |
87 $(eval $(call SetupCopyFiles, COPY_JLI_TRACE, \ |
88 FILES := $(JLI_TRACE_FILE), \ |
88 FILES := $(JLI_TRACE_FILE), \ |
89 DEST := $(JDK_OUTPUTDIR)/modules/jdk.jlink/jdk/tools/jlink/internal/plugins, \ |
89 DEST := $(JDK_OUTPUTDIR)/modules/jdk.jlink/jdk/tools/jlink/internal/plugins, \ |
90 )) |
90 )) |
91 |
91 |
|
92 # Because of the single recipe for jli trace and classlist above, the |
|
93 # COPY_JLI_TRACE rule needs to explicitly add the classlist file as a |
|
94 # prerequisite. |
|
95 $(COPY_JLI_TRACE): $(CLASSLIST_FILE) |
|
96 |
92 TARGETS += $(COPY_JLI_TRACE) |
97 TARGETS += $(COPY_JLI_TRACE) |
93 |
98 |
94 ################################################################################ |
99 ################################################################################ |
95 |
100 |
96 all: $(TARGETS) |
101 all: $(TARGETS) |