7172922: export_ makefile targets do not work unless all supported variants are built

Mon, 15 Apr 2013 16:20:05 -0700

author
twisti
date
Mon, 15 Apr 2013 16:20:05 -0700
changeset 4946
1c6887c9afaa
parent 4945
bb4a966cc68f
child 4948
b105029fdbfd
child 4949
8373c19be854

7172922: export_ makefile targets do not work unless all supported variants are built
Reviewed-by: dholmes, kvn

make/Makefile file | annotate | diff | comparison | revisions
     1.1 --- a/make/Makefile	Mon Apr 15 09:42:46 2013 +0200
     1.2 +++ b/make/Makefile	Mon Apr 15 16:20:05 2013 -0700
     1.3 @@ -287,186 +287,191 @@
     1.4  
     1.5  # Export file copy rules
     1.6  XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
     1.7 -DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
     1.8 -C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
     1.9 -C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
    1.10 -ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero
    1.11 -SHARK_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark
    1.12 -C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
    1.13 -C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
    1.14 -ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
    1.15 -SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
    1.16 -MINIMAL1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1
    1.17 -MINIMAL1_DIR=$(MINIMAL1_BASE_DIR)/$(VM_SUBDIR)
    1.18 +DOCS_DIR    =$(OUTPUTDIR)/$(VM_PLATFORM)_docs
    1.19 +C1_DIR      =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1/$(VM_SUBDIR)
    1.20 +C2_DIR      =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2/$(VM_SUBDIR)
    1.21 +MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1/$(VM_SUBDIR)
    1.22 +ZERO_DIR    =$(OUTPUTDIR)/$(VM_PLATFORM)_zero/$(VM_SUBDIR)
    1.23 +SHARK_DIR   =$(OUTPUTDIR)/$(VM_PLATFORM)_shark/$(VM_SUBDIR)
    1.24  
    1.25 +# Server (C2)
    1.26  ifeq ($(JVM_VARIANT_SERVER), true)
    1.27 -    MISC_DIR=$(C2_DIR)
    1.28 -    GEN_DIR=$(C2_BASE_DIR)/generated
    1.29 -endif
    1.30 -ifeq ($(JVM_VARIANT_CLIENT), true)
    1.31 -    MISC_DIR=$(C1_DIR)
    1.32 -    GEN_DIR=$(C1_BASE_DIR)/generated
    1.33 -endif
    1.34 -ifeq ($(JVM_VARIANT_ZEROSHARK), true)
    1.35 -    MISC_DIR=$(SHARK_DIR)
    1.36 -    GEN_DIR=$(SHARK_BASE_DIR)/generated
    1.37 -endif
    1.38 -ifeq ($(JVM_VARIANT_ZERO), true)
    1.39 -    MISC_DIR=$(ZERO_DIR)
    1.40 -    GEN_DIR=$(ZERO_BASE_DIR)/generated
    1.41 -endif
    1.42 -ifeq ($(JVM_VARIANT_MINIMAL1), true)
    1.43 -    MISC_DIR=$(MINIMAL1_DIR)
    1.44 -    GEN_DIR=$(MINIMAL1_BASE_DIR)/generated
    1.45 -endif
    1.46 -
    1.47 -# Bin files (windows)
    1.48 -ifeq ($(OSNAME),windows)
    1.49 -
    1.50 -# Get jvm.lib
    1.51 -$(EXPORT_LIB_DIR)/%.lib:  $(MISC_DIR)/%.lib
    1.52 +# Common
    1.53 +$(EXPORT_SERVER_DIR)/%.diz:       		$(C2_DIR)/%.diz
    1.54  	$(install-file)
    1.55 -
    1.56 -# Other libraries (like SA)
    1.57 -$(EXPORT_JRE_BIN_DIR)/%.diz: $(MISC_DIR)/%.diz
    1.58 +$(EXPORT_LIB_DIR)/%.jar:			$(C2_DIR)/../generated/%.jar
    1.59  	$(install-file)
    1.60 -$(EXPORT_JRE_BIN_DIR)/%.dll: $(MISC_DIR)/%.dll
    1.61 +$(EXPORT_INCLUDE_DIR)/%:			$(C2_DIR)/../generated/jvmtifiles/%
    1.62  	$(install-file)
    1.63 -$(EXPORT_JRE_BIN_DIR)/%.pdb: $(MISC_DIR)/%.pdb
    1.64 +# Windows
    1.65 +$(EXPORT_SERVER_DIR)/%.dll:			$(C2_DIR)/%.dll
    1.66  	$(install-file)
    1.67 -$(EXPORT_JRE_BIN_DIR)/%.map: $(MISC_DIR)/%.map
    1.68 +$(EXPORT_SERVER_DIR)/%.pdb:			$(C2_DIR)/%.pdb
    1.69  	$(install-file)
    1.70 -
    1.71 -# Client files always come from C1 area
    1.72 -$(EXPORT_CLIENT_DIR)/%.diz:  $(C1_DIR)/%.diz
    1.73 +$(EXPORT_SERVER_DIR)/%.map:			$(C2_DIR)/%.map
    1.74  	$(install-file)
    1.75 -$(EXPORT_CLIENT_DIR)/%.dll:  $(C1_DIR)/%.dll
    1.76 +$(EXPORT_LIB_DIR)/%.lib:			$(C2_DIR)/%.lib
    1.77  	$(install-file)
    1.78 -$(EXPORT_CLIENT_DIR)/%.pdb:  $(C1_DIR)/%.pdb
    1.79 +$(EXPORT_JRE_BIN_DIR)/%.diz:			$(C2_DIR)/%.diz
    1.80  	$(install-file)
    1.81 -$(EXPORT_CLIENT_DIR)/%.map:  $(C1_DIR)/%.map
    1.82 +$(EXPORT_JRE_BIN_DIR)/%.dll:			$(C2_DIR)/%.dll
    1.83  	$(install-file)
    1.84 -
    1.85 -# Server files always come from C2 area
    1.86 -$(EXPORT_SERVER_DIR)/%.diz:  $(C2_DIR)/%.diz
    1.87 +$(EXPORT_JRE_BIN_DIR)/%.pdb:			$(C2_DIR)/%.pdb
    1.88  	$(install-file)
    1.89 -$(EXPORT_SERVER_DIR)/%.dll:  $(C2_DIR)/%.dll
    1.90 +$(EXPORT_JRE_BIN_DIR)/%.map:			$(C2_DIR)/%.map
    1.91  	$(install-file)
    1.92 -$(EXPORT_SERVER_DIR)/%.pdb:  $(C2_DIR)/%.pdb
    1.93 +# Unix
    1.94 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
    1.95  	$(install-file)
    1.96 -$(EXPORT_SERVER_DIR)/%.map:  $(C2_DIR)/%.map
    1.97 +$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(C2_DIR)/%.$(LIBRARY_SUFFIX)
    1.98 +	$(install-file)
    1.99 +$(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX):    $(C2_DIR)/%.$(LIBRARY_SUFFIX)
   1.100 +	$(install-file)
   1.101 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: 	$(C2_DIR)/%.debuginfo
   1.102 +	$(install-file)
   1.103 +$(EXPORT_SERVER_DIR)/%.debuginfo:       	$(C2_DIR)/%.debuginfo
   1.104 +	$(install-file)
   1.105 +$(EXPORT_SERVER_DIR)/64/%.debuginfo:    	$(C2_DIR)/%.debuginfo
   1.106 +	$(install-file)
   1.107 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: 		$(C2_DIR)/%.diz
   1.108 +	$(install-file)
   1.109 +$(EXPORT_SERVER_DIR)/64/%.diz:    		$(C2_DIR)/%.diz
   1.110  	$(install-file)
   1.111  endif
   1.112  
   1.113 -# Minimal JVM files always come from minimal area
   1.114 -$(EXPORT_MINIMAL_DIR)/%.diz:  $(MINIMAL1_DIR)/%.diz
   1.115 +# Client (C1)
   1.116 +ifeq ($(JVM_VARIANT_CLIENT), true)
   1.117 +# Common
   1.118 +$(EXPORT_CLIENT_DIR)/%.diz:       		$(C1_DIR)/%.diz
   1.119  	$(install-file)
   1.120 -$(EXPORT_MINIMAL_DIR)/%.dll:  $(MINIMAL1_DIR)/%.dll
   1.121 +$(EXPORT_LIB_DIR)/%.jar:			$(C1_DIR)/../generated/%.jar
   1.122  	$(install-file)
   1.123 -$(EXPORT_MINIMAL_DIR)/%.pdb:  $(MINIMAL1_DIR)/%.pdb
   1.124 +$(EXPORT_INCLUDE_DIR)/%:			$(C1_DIR)/../generated/jvmtifiles/%
   1.125  	$(install-file)
   1.126 -$(EXPORT_MINIMAL_DIR)/%.map:  $(MINIMAL1_DIR)/%.map
   1.127 +# Windows
   1.128 +$(EXPORT_CLIENT_DIR)/%.dll:			$(C1_DIR)/%.dll
   1.129  	$(install-file)
   1.130 -
   1.131 -# Shared Library
   1.132 -ifneq ($(OSNAME),windows)
   1.133 -    ifeq ($(JVM_VARIANT_SERVER), true)
   1.134 -        $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
   1.135 -		$(install-file)
   1.136 -        $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(C2_DIR)/%.$(LIBRARY_SUFFIX)
   1.137 -		$(install-file)
   1.138 -        $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX):    $(C2_DIR)/%.$(LIBRARY_SUFFIX)
   1.139 -		$(install-file)
   1.140 -        $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: 		$(C2_DIR)/%.debuginfo
   1.141 -		$(install-file)
   1.142 -        $(EXPORT_SERVER_DIR)/%.debuginfo:       		$(C2_DIR)/%.debuginfo
   1.143 -		$(install-file)
   1.144 -        $(EXPORT_SERVER_DIR)/64/%.debuginfo:    		$(C2_DIR)/%.debuginfo
   1.145 -		$(install-file)
   1.146 -        $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: 			$(C2_DIR)/%.diz
   1.147 -		$(install-file)
   1.148 -        $(EXPORT_SERVER_DIR)/%.diz:       			$(C2_DIR)/%.diz
   1.149 -		$(install-file)
   1.150 -        $(EXPORT_SERVER_DIR)/64/%.diz:    			$(C2_DIR)/%.diz
   1.151 -		$(install-file)
   1.152 -    endif
   1.153 -    ifeq ($(JVM_VARIANT_CLIENT), true)
   1.154 -        $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
   1.155 -		$(install-file)
   1.156 -        $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX):       $(C1_DIR)/%.$(LIBRARY_SUFFIX)
   1.157 -		$(install-file)
   1.158 -        $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX):    $(C1_DIR)/%.$(LIBRARY_SUFFIX)
   1.159 -		$(install-file)
   1.160 -        $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: 		$(C1_DIR)/%.debuginfo
   1.161 -		$(install-file)
   1.162 -        $(EXPORT_CLIENT_DIR)/%.debuginfo:       		$(C1_DIR)/%.debuginfo
   1.163 -		$(install-file)
   1.164 -        $(EXPORT_CLIENT_DIR)/64/%.debuginfo:    		$(C1_DIR)/%.debuginfo
   1.165 -		$(install-file)
   1.166 -        $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: 			$(C1_DIR)/%.diz
   1.167 -		$(install-file)
   1.168 -        $(EXPORT_CLIENT_DIR)/%.diz:       			$(C1_DIR)/%.diz
   1.169 -		$(install-file)
   1.170 -        $(EXPORT_CLIENT_DIR)/64/%.diz:    			$(C1_DIR)/%.diz
   1.171 -		$(install-file)
   1.172 -    endif
   1.173 -    ifeq ($(JVM_VARIANT_ZEROSHARK), true)
   1.174 -        $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
   1.175 -		$(install-file)
   1.176 -        $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo):	$(SHARK_DIR)/%.debuginfo
   1.177 -		$(install-file)
   1.178 -        $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz:		$(SHARK_DIR)/%.diz
   1.179 -		$(install-file)
   1.180 -        $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
   1.181 -		$(install-file)
   1.182 -        $(EXPORT_SERVER_DIR)/%.debuginfo:		$(SHARK_DIR)/%.debuginfo
   1.183 -		$(install-file)
   1.184 -        $(EXPORT_SERVER_DIR)/%.diz:			$(SHARK_DIR)/%.diz
   1.185 -		$(install-file)
   1.186 -    endif
   1.187 -    ifeq ($(JVM_VARIANT_ZERO), true)
   1.188 -        $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
   1.189 -		$(install-file)
   1.190 -        $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo:		$(ZERO_DIR)/%.debuginfo
   1.191 -		$(install-file)
   1.192 -        $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz:		$(ZERO_DIR)/%.diz
   1.193 -		$(install-file)
   1.194 -        $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
   1.195 -		$(install-file)
   1.196 -        $(EXPORT_SERVER_DIR)/%.debuginfo:		$(ZERO_DIR)/%.debuginfo
   1.197 -		$(install-file)
   1.198 -        $(EXPORT_SERVER_DIR)/%.diz:			$(ZERO_DIR)/%.diz
   1.199 -		$(install-file)
   1.200 -    endif
   1.201 -    ifeq ($(JVM_VARIANT_MINIMAL1), true)
   1.202 -        $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX):	$(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
   1.203 -		$(install-file)
   1.204 -        $(EXPORT_MINIMAL_DIR)/%.$(LIBRARY_SUFFIX):	$(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
   1.205 -		$(install-file)
   1.206 -        $(EXPORT_MINIMAL_DIR)/64/%.$(LIBRARY_SUFFIX):	$(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
   1.207 -		$(install-file)
   1.208 -        $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo:		$(MINIMAL1_DIR)/%.debuginfo
   1.209 -		$(install-file)
   1.210 -        $(EXPORT_MINIMAL_DIR)/%.debuginfo:		$(MINIMAL1_DIR)/%.debuginfo
   1.211 -		$(install-file)
   1.212 -        $(EXPORT_MINIMAL_DIR)/64/%.debuginfo:		$(MINIMAL1_DIR)/%.debuginfo
   1.213 -		$(install-file)
   1.214 -        $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz:		$(MINIMAL1_DIR)/%.diz
   1.215 -		$(install-file)
   1.216 -        $(EXPORT_MINIMAL_DIR)/%.diz:			$(MINIMAL1_DIR)/%.diz
   1.217 -		$(install-file)
   1.218 -        $(EXPORT_MINIMAL_DIR)/64/%.diz:			$(MINIMAL1_DIR)/%.diz
   1.219 -		$(install-file)
   1.220 -    endif
   1.221 +$(EXPORT_CLIENT_DIR)/%.pdb:			$(C1_DIR)/%.pdb
   1.222 +	$(install-file)
   1.223 +$(EXPORT_CLIENT_DIR)/%.map:			$(C1_DIR)/%.map
   1.224 +	$(install-file)
   1.225 +$(EXPORT_LIB_DIR)/%.lib:			$(C1_DIR)/%.lib
   1.226 +	$(install-file)
   1.227 +$(EXPORT_JRE_BIN_DIR)/%.diz:			$(C1_DIR)/%.diz
   1.228 +	$(install-file)
   1.229 +$(EXPORT_JRE_BIN_DIR)/%.dll:			$(C1_DIR)/%.dll
   1.230 +	$(install-file)
   1.231 +$(EXPORT_JRE_BIN_DIR)/%.pdb:			$(C1_DIR)/%.pdb
   1.232 +	$(install-file)
   1.233 +$(EXPORT_JRE_BIN_DIR)/%.map:			$(C1_DIR)/%.map
   1.234 +	$(install-file)
   1.235 +# Unix
   1.236 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
   1.237 +	$(install-file)
   1.238 +$(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX):       $(C1_DIR)/%.$(LIBRARY_SUFFIX)
   1.239 +	$(install-file)
   1.240 +$(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX):    $(C1_DIR)/%.$(LIBRARY_SUFFIX)
   1.241 +	$(install-file)
   1.242 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: 	$(C1_DIR)/%.debuginfo
   1.243 +	$(install-file)
   1.244 +$(EXPORT_CLIENT_DIR)/%.debuginfo:       	$(C1_DIR)/%.debuginfo
   1.245 +	$(install-file)
   1.246 +$(EXPORT_CLIENT_DIR)/64/%.debuginfo:    	$(C1_DIR)/%.debuginfo
   1.247 +	$(install-file)
   1.248 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: 		$(C1_DIR)/%.diz
   1.249 +	$(install-file)
   1.250 +$(EXPORT_CLIENT_DIR)/64/%.diz:    		$(C1_DIR)/%.diz
   1.251 +	$(install-file)
   1.252  endif
   1.253  
   1.254 -# Jar file (sa-jdi.jar)
   1.255 -$(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar
   1.256 +# Minimal1
   1.257 +ifeq ($(JVM_VARIANT_MINIMAL1), true)
   1.258 +# Common
   1.259 +$(EXPORT_MINIMAL_DIR)/%.diz:			$(MINIMAL1_DIR)/%.diz
   1.260  	$(install-file)
   1.261 +$(EXPORT_LIB_DIR)/%.jar:			$(MINIMAL1_DIR)/../generated/%.jar
   1.262 +	$(install-file)
   1.263 +$(EXPORT_INCLUDE_DIR)/%:			$(MINIMAL1_DIR)/../generated/jvmtifiles/%
   1.264 +	$(install-file)
   1.265 +# Windows
   1.266 +$(EXPORT_MINIMAL_DIR)/%.dll:			$(MINIMAL1_DIR)/%.dll
   1.267 +	$(install-file)
   1.268 +$(EXPORT_MINIMAL_DIR)/%.pdb:			$(MINIMAL1_DIR)/%.pdb
   1.269 +	$(install-file)
   1.270 +$(EXPORT_MINIMAL_DIR)/%.map:			$(MINIMAL1_DIR)/%.map
   1.271 +	$(install-file)
   1.272 +$(EXPORT_LIB_DIR)/%.lib:			$(MINIMAL1_DIR)/%.lib
   1.273 +	$(install-file)
   1.274 +$(EXPORT_JRE_BIN_DIR)/%.diz:			$(MINIMAL1_DIR)/%.diz
   1.275 +	$(install-file)
   1.276 +$(EXPORT_JRE_BIN_DIR)/%.dll:			$(MINIMAL1_DIR)/%.dll
   1.277 +	$(install-file)
   1.278 +$(EXPORT_JRE_BIN_DIR)/%.pdb:			$(MINIMAL1_DIR)/%.pdb
   1.279 +	$(install-file)
   1.280 +$(EXPORT_JRE_BIN_DIR)/%.map:			$(MINIMAL1_DIR)/%.map
   1.281 +	$(install-file)
   1.282 +# Unix
   1.283 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX):	$(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
   1.284 +	$(install-file)
   1.285 +$(EXPORT_MINIMAL_DIR)/%.$(LIBRARY_SUFFIX):	$(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
   1.286 +	$(install-file)
   1.287 +$(EXPORT_MINIMAL_DIR)/64/%.$(LIBRARY_SUFFIX):	$(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
   1.288 +	$(install-file)
   1.289 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo:		$(MINIMAL1_DIR)/%.debuginfo
   1.290 +	$(install-file)
   1.291 +$(EXPORT_MINIMAL_DIR)/%.debuginfo:		$(MINIMAL1_DIR)/%.debuginfo
   1.292 +	$(install-file)
   1.293 +$(EXPORT_MINIMAL_DIR)/64/%.debuginfo:		$(MINIMAL1_DIR)/%.debuginfo
   1.294 +	$(install-file)
   1.295 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz:		$(MINIMAL1_DIR)/%.diz
   1.296 +	$(install-file)
   1.297 +$(EXPORT_MINIMAL_DIR)/64/%.diz:			$(MINIMAL1_DIR)/%.diz
   1.298 +	$(install-file)
   1.299 +endif
   1.300  
   1.301 -# Include files (jvmti.h, jvmticmlr.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h, jfr.h)
   1.302 -$(EXPORT_INCLUDE_DIR)/%: $(GEN_DIR)/jvmtifiles/%
   1.303 +# Zero
   1.304 +ifeq ($(JVM_VARIANT_ZERO), true)
   1.305 +# Common
   1.306 +$(EXPORT_LIB_DIR)/%.jar:			$(ZERO_DIR)/../generated/%.jar
   1.307  	$(install-file)
   1.308 +$(EXPORT_INCLUDE_DIR)/%:			$(ZERO_DIR)/../generated/jvmtifiles/%
   1.309 +	$(install-file)
   1.310 +# Unix
   1.311 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
   1.312 +	$(install-file)
   1.313 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo:		$(ZERO_DIR)/%.debuginfo
   1.314 +	$(install-file)
   1.315 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz:		$(ZERO_DIR)/%.diz
   1.316 +	$(install-file)
   1.317 +$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
   1.318 +	$(install-file)
   1.319 +$(EXPORT_SERVER_DIR)/%.debuginfo:		$(ZERO_DIR)/%.debuginfo
   1.320 +	$(install-file)
   1.321 +$(EXPORT_SERVER_DIR)/%.diz:			$(ZERO_DIR)/%.diz
   1.322 +	$(install-file)
   1.323 +endif
   1.324 +
   1.325 +# Shark
   1.326 +ifeq ($(JVM_VARIANT_ZEROSHARK), true)
   1.327 +# Common
   1.328 +$(EXPORT_LIB_DIR)/%.jar:			$(SHARK_DIR)/../generated/%.jar
   1.329 +	$(install-file)
   1.330 +$(EXPORT_INCLUDE_DIR)/%:			$(SHARK_DIR)/../generated/jvmtifiles/%
   1.331 +	$(install-file)
   1.332 +# Unix
   1.333 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
   1.334 +	$(install-file)
   1.335 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo):	$(SHARK_DIR)/%.debuginfo
   1.336 +	$(install-file)
   1.337 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz:		$(SHARK_DIR)/%.diz
   1.338 +	$(install-file)
   1.339 +$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
   1.340 +	$(install-file)
   1.341 +$(EXPORT_SERVER_DIR)/%.debuginfo:		$(SHARK_DIR)/%.debuginfo
   1.342 +	$(install-file)
   1.343 +$(EXPORT_SERVER_DIR)/%.diz:			$(SHARK_DIR)/%.diz
   1.344 +	$(install-file)
   1.345 +endif
   1.346  
   1.347  $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/%
   1.348  	$(install-file)

mercurial