comparison make/jvmci.make @ 21955:3ce35131bff2

Introduce clean target in jvmci.make
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Fri, 12 Jun 2015 18:02:58 +0200
parents 0458778bb188
children f0a982a28944
comparison
equal deleted inserted replaced
21954:659968246e60 21955:3ce35131bff2
11 11
12 # Directories, where the generated property-files reside within the JAR files 12 # Directories, where the generated property-files reside within the JAR files
13 PROVIDERS_INF=/META-INF/jvmci.providers 13 PROVIDERS_INF=/META-INF/jvmci.providers
14 SERVICES_INF=/META-INF/jvmci.services 14 SERVICES_INF=/META-INF/jvmci.services
15 OPTIONS_INF=/META-INF/jvmci.options 15 OPTIONS_INF=/META-INF/jvmci.options
16
17 JARS = $(foreach dist,$(DISTRIBUTIONS),$($(dist)_JAR))
16 18
17 ifeq ($(ABS_BOOTDIR),) 19 ifeq ($(ABS_BOOTDIR),)
18 $(error Variable ABS_BOOTDIR must be set to a JDK installation.) 20 $(error Variable ABS_BOOTDIR must be set to a JDK installation.)
19 endif 21 endif
20 ifeq ($(MAKE_VERBOSE),) 22 ifeq ($(MAKE_VERBOSE),)
105 export: all 107 export: all
106 $(call verify_defs_make,$(notdir $(wildcard $(SHARED_DIR)/jvmci.services/*)),EXPORT_LIST += $$(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/) 108 $(call verify_defs_make,$(notdir $(wildcard $(SHARED_DIR)/jvmci.services/*)),EXPORT_LIST += $$(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/)
107 $(call verify_defs_make,$(notdir $(wildcard $(SHARED_DIR)/jvmci.options/*)),EXPORT_LIST += $$(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/) 109 $(call verify_defs_make,$(notdir $(wildcard $(SHARED_DIR)/jvmci.options/*)),EXPORT_LIST += $$(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/)
108 .PHONY: export 110 .PHONY: export
109 111
112 clean:
113 $(QUIETLY) rm $(JARS) 2> /dev/null || true
114 $(QUIETLY) rmdir -p $(dir $(JARS)) 2> /dev/null || true
115 .PHONY: export clean
116
110 117
111 118
112 JDK_BOOTCLASSPATH = $(ABS_BOOTDIR)/jre/lib/resources.jar:$(ABS_BOOTDIR)/jre/lib/rt.jar:$(ABS_BOOTDIR)/jre/lib/jsse.jar:$(ABS_BOOTDIR)/jre/lib/jce.jar:$(ABS_BOOTDIR)/jre/lib/charsets.jar:$(ABS_BOOTDIR)/jre/lib/jfr.jar 119 JDK_BOOTCLASSPATH = $(ABS_BOOTDIR)/jre/lib/resources.jar:$(ABS_BOOTDIR)/jre/lib/rt.jar:$(ABS_BOOTDIR)/jre/lib/jsse.jar:$(ABS_BOOTDIR)/jre/lib/jce.jar:$(ABS_BOOTDIR)/jre/lib/charsets.jar:$(ABS_BOOTDIR)/jre/lib/jfr.jar
113 120
114 JVMCI_OPTIONS_PROCESSOR_SRC = $(shell find jvmci/com.oracle.jvmci.options/src -type f 2> /dev/null) 121 JVMCI_OPTIONS_PROCESSOR_SRC = $(shell find jvmci/com.oracle.jvmci.options/src -type f 2> /dev/null)
161 168
162 JVMCI_HOTSPOT_DEP_JARS = $(TARGET)/build/jvmci-api.jar $(TARGET)/build/jvmci-service.jar jvmci/findbugs-SuppressFBWarnings.jar 169 JVMCI_HOTSPOT_DEP_JARS = $(TARGET)/build/jvmci-api.jar $(TARGET)/build/jvmci-service.jar jvmci/findbugs-SuppressFBWarnings.jar
163 170
164 EXPORTED_FILES += $(JVMCI_HOTSPOT_JAR) 171 EXPORTED_FILES += $(JVMCI_HOTSPOT_JAR)
165 172
173 DISTRIBUTIONS = JVMCI_API JVMCI_SERVICE JVMCI_HOTSPOT JVMCI_OPTIONS_PROCESSOR JVMCI_HOTSPOTVMCONFIG_PROCESSOR JVMCI_SERVICE_PROCESSOR
174
166 $(JVMCI_OPTIONS_PROCESSOR_JAR): $(JVMCI_OPTIONS_PROCESSOR_SRC) 175 $(JVMCI_OPTIONS_PROCESSOR_JAR): $(JVMCI_OPTIONS_PROCESSOR_SRC)
167 $(call build_and_jar,,$(subst $(space),:,),jvmci/com.oracle.jvmci.options.processor/src/META-INF,$(JVMCI_OPTIONS_PROCESSOR_JAR)) 176 $(call build_and_jar,,$(subst $(space),:,),jvmci/com.oracle.jvmci.options.processor/src/META-INF,$(JVMCI_OPTIONS_PROCESSOR_JAR))
168 177
169 178
170 $(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_JAR): $(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_SRC) 179 $(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_JAR): $(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_SRC)