1.1 --- a/common/nb_native/nbproject/configurations.xml Thu Nov 07 08:16:05 2013 -0800
1.2 +++ b/common/nb_native/nbproject/configurations.xml Thu Nov 14 10:53:23 2013 +0100
1.3 @@ -4987,7 +4987,7 @@
1.4 <pElem>../../jdk/src/share/back</pElem>
1.5 <pElem>../../jdk/src/solaris/back</pElem>
1.6 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
1.7 - <pElem>../../jdk/makefiles</pElem>
1.8 + <pElem>../../jdk/make</pElem>
1.9 </incDir>
1.10 <preprocessorList>
1.11 <Elem>ARCH="amd64"</Elem>
1.12 @@ -5064,7 +5064,7 @@
1.13 <pElem>../../jdk/src/solaris/native/common</pElem>
1.14 <pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
1.15 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.16 - <pElem>../../jdk/makefiles</pElem>
1.17 + <pElem>../../jdk/make</pElem>
1.18 </incDir>
1.19 </ccTool>
1.20 </folder>
1.21 @@ -5074,7 +5074,7 @@
1.22 <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
1.23 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.24 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.25 - <pElem>../../jdk/makefiles</pElem>
1.26 + <pElem>../../jdk/make</pElem>
1.27 </incDir>
1.28 </cTool>
1.29 </folder>
1.30 @@ -5083,7 +5083,7 @@
1.31 <incDir>
1.32 <pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
1.33 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.34 - <pElem>../../jdk/makefiles</pElem>
1.35 + <pElem>../../jdk/make</pElem>
1.36 </incDir>
1.37 <preprocessorList>
1.38 <Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
1.39 @@ -5095,7 +5095,7 @@
1.40 <incDir>
1.41 <pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
1.42 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.43 - <pElem>../../jdk/makefiles</pElem>
1.44 + <pElem>../../jdk/make</pElem>
1.45 </incDir>
1.46 <preprocessorList>
1.47 <Elem>THIS_FILE="gctest.c"</Elem>
1.48 @@ -5108,7 +5108,7 @@
1.49 <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
1.50 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.51 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.52 - <pElem>../../jdk/makefiles</pElem>
1.53 + <pElem>../../jdk/make</pElem>
1.54 </incDir>
1.55 <preprocessorList>
1.56 <Elem>THIS_FILE="heapTracker.c"</Elem>
1.57 @@ -5120,7 +5120,7 @@
1.58 <incDir>
1.59 <pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
1.60 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.61 - <pElem>../../jdk/makefiles</pElem>
1.62 + <pElem>../../jdk/make</pElem>
1.63 </incDir>
1.64 <preprocessorList>
1.65 <Elem>THIS_FILE="heapViewer.c"</Elem>
1.66 @@ -5135,7 +5135,7 @@
1.67 <pElem>../../jdk/src/share/npt</pElem>
1.68 <pElem>../../jdk/src/solaris/npt</pElem>
1.69 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.70 - <pElem>../../jdk/makefiles</pElem>
1.71 + <pElem>../../jdk/make</pElem>
1.72 </incDir>
1.73 <preprocessorList>
1.74 <Elem>THIS_FILE="debug_malloc.c"</Elem>
1.75 @@ -5150,7 +5150,7 @@
1.76 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.77 <pElem>../../jdk/src/share/npt</pElem>
1.78 <pElem>../../jdk/src/solaris/npt</pElem>
1.79 - <pElem>../../jdk/makefiles</pElem>
1.80 + <pElem>../../jdk/make</pElem>
1.81 </incDir>
1.82 <preprocessorList>
1.83 <Elem>THIS_FILE="java_crw_demo.c"</Elem>
1.84 @@ -5163,7 +5163,7 @@
1.85 <pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
1.86 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.87 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.88 - <pElem>../../jdk/makefiles</pElem>
1.89 + <pElem>../../jdk/make</pElem>
1.90 </incDir>
1.91 <preprocessorList>
1.92 <Elem>THIS_FILE="minst.c"</Elem>
1.93 @@ -5176,7 +5176,7 @@
1.94 <pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
1.95 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.96 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.97 - <pElem>../../jdk/makefiles</pElem>
1.98 + <pElem>../../jdk/make</pElem>
1.99 </incDir>
1.100 <preprocessorList>
1.101 <Elem>THIS_FILE="mtrace.c"</Elem>
1.102 @@ -5188,7 +5188,7 @@
1.103 <incDir>
1.104 <pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
1.105 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.106 - <pElem>../../jdk/makefiles</pElem>
1.107 + <pElem>../../jdk/make</pElem>
1.108 </incDir>
1.109 <preprocessorList>
1.110 <Elem>THIS_FILE="versionCheck.c"</Elem>
1.111 @@ -5208,7 +5208,7 @@
1.112 <pElem>../../jdk/src/share/instrument</pElem>
1.113 <pElem>../../jdk/src/solaris/instrument</pElem>
1.114 <pElem>../../jdk/src/share/bin</pElem>
1.115 - <pElem>../../jdk/makefiles</pElem>
1.116 + <pElem>../../jdk/make</pElem>
1.117 </incDir>
1.118 <preprocessorList>
1.119 <Elem>ARCH="amd64"</Elem>
1.120 @@ -5250,7 +5250,7 @@
1.121 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.122 <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
1.123 <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
1.124 - <pElem>../../jdk/makefiles</pElem>
1.125 + <pElem>../../jdk/make</pElem>
1.126 </incDir>
1.127 <preprocessorList>
1.128 <Elem>ARCH="amd64"</Elem>
1.129 @@ -5342,7 +5342,7 @@
1.130 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.131 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.132 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.133 - <pElem>../../jdk/makefiles</pElem>
1.134 + <pElem>../../jdk/make</pElem>
1.135 </incDir>
1.136 <preprocessorList>
1.137 <Elem>ARCHPROPNAME="amd64"</Elem>
1.138 @@ -5373,7 +5373,7 @@
1.139 <cTool>
1.140 <incDir>
1.141 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.142 - <pElem>../../jdk/makefiles</pElem>
1.143 + <pElem>../../jdk/make</pElem>
1.144 </incDir>
1.145 </cTool>
1.146 </folder>
1.147 @@ -5395,7 +5395,7 @@
1.148 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.149 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.150 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.151 - <pElem>../../jdk/makefiles</pElem>
1.152 + <pElem>../../jdk/make</pElem>
1.153 </incDir>
1.154 <preprocessorList>
1.155 <Elem>ARCHPROPNAME="amd64"</Elem>
1.156 @@ -5425,7 +5425,7 @@
1.157 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.158 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.159 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.160 - <pElem>../../jdk/makefiles</pElem>
1.161 + <pElem>../../jdk/make</pElem>
1.162 </incDir>
1.163 <preprocessorList>
1.164 <Elem>ARCHPROPNAME="amd64"</Elem>
1.165 @@ -5452,7 +5452,7 @@
1.166 <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
1.167 <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
1.168 <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
1.169 - <pElem>../../jdk/makefiles</pElem>
1.170 + <pElem>../../jdk/make</pElem>
1.171 </incDir>
1.172 <preprocessorList>
1.173 <Elem>THIS_FILE="DatagramPacket.c"</Elem>
1.174 @@ -5484,7 +5484,7 @@
1.175 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.176 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.177 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.178 - <pElem>../../jdk/makefiles</pElem>
1.179 + <pElem>../../jdk/make</pElem>
1.180 </incDir>
1.181 <preprocessorList>
1.182 <Elem>ARCHPROPNAME="amd64"</Elem>
1.183 @@ -5521,7 +5521,7 @@
1.184 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.185 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.186 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.187 - <pElem>../../jdk/makefiles</pElem>
1.188 + <pElem>../../jdk/make</pElem>
1.189 </incDir>
1.190 <preprocessorList>
1.191 <Elem>ARCHPROPNAME="amd64"</Elem>
1.192 @@ -5565,7 +5565,7 @@
1.193 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.194 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.195 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.196 - <pElem>../../jdk/makefiles</pElem>
1.197 + <pElem>../../jdk/make</pElem>
1.198 </incDir>
1.199 <preprocessorList>
1.200 <Elem>ARCHPROPNAME="amd64"</Elem>
1.201 @@ -5601,7 +5601,7 @@
1.202 <pElem>../../jdk/src/share/native/common</pElem>
1.203 <pElem>../../jdk/src/solaris/native/common</pElem>
1.204 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.205 - <pElem>../../jdk/makefiles</pElem>
1.206 + <pElem>../../jdk/make</pElem>
1.207 </incDir>
1.208 <preprocessorList>
1.209 <Elem>PNG_NO_MMX_CODE</Elem>
1.210 @@ -5673,7 +5673,7 @@
1.211 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.212 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.213 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.214 - <pElem>../../jdk/makefiles</pElem>
1.215 + <pElem>../../jdk/make</pElem>
1.216 </incDir>
1.217 <preprocessorList>
1.218 <Elem>INTERNAL_BUILD</Elem>
1.219 @@ -5702,7 +5702,7 @@
1.220 <pElem>../../jdk/src/share/native/common</pElem>
1.221 <pElem>../../jdk/src/solaris/native/common</pElem>
1.222 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.223 - <pElem>../../jdk/makefiles</pElem>
1.224 + <pElem>../../jdk/make</pElem>
1.225 </incDir>
1.226 <preprocessorList>
1.227 <Elem>PNG_NO_MMX_CODE</Elem>
1.228 @@ -5745,7 +5745,7 @@
1.229 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.230 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.231 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.232 - <pElem>../../jdk/makefiles</pElem>
1.233 + <pElem>../../jdk/make</pElem>
1.234 </incDir>
1.235 <preprocessorList>
1.236 <Elem>INTERNAL_BUILD</Elem>
1.237 @@ -5781,7 +5781,7 @@
1.238 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.239 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.240 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.241 - <pElem>../../jdk/makefiles</pElem>
1.242 + <pElem>../../jdk/make</pElem>
1.243 </incDir>
1.244 <preprocessorList>
1.245 <Elem>INTERNAL_BUILD</Elem>
1.246 @@ -5817,7 +5817,7 @@
1.247 <pElem>../../jdk/src/share/native/common</pElem>
1.248 <pElem>../../jdk/src/solaris/native/common</pElem>
1.249 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.250 - <pElem>../../jdk/makefiles</pElem>
1.251 + <pElem>../../jdk/make</pElem>
1.252 </incDir>
1.253 <preprocessorList>
1.254 <Elem>PNG_NO_MMX_CODE</Elem>
1.255 @@ -5864,7 +5864,7 @@
1.256 <pElem>../../jdk/src/share/native/common</pElem>
1.257 <pElem>../../jdk/src/solaris/native/common</pElem>
1.258 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.259 - <pElem>../../jdk/makefiles</pElem>
1.260 + <pElem>../../jdk/make</pElem>
1.261 </incDir>
1.262 <preprocessorList>
1.263 <Elem>PNG_NO_MMX_CODE</Elem>
1.264 @@ -5900,7 +5900,7 @@
1.265 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.266 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.267 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.268 - <pElem>../../jdk/makefiles</pElem>
1.269 + <pElem>../../jdk/make</pElem>
1.270 </incDir>
1.271 <preprocessorList>
1.272 <Elem>INTERNAL_BUILD</Elem>
1.273 @@ -5949,7 +5949,7 @@
1.274 <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
1.275 <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
1.276 <pElem>../../jdk/src/share/native/sun/java2d</pElem>
1.277 - <pElem>../../jdk/makefiles</pElem>
1.278 + <pElem>../../jdk/make</pElem>
1.279 </incDir>
1.280 <preprocessorList>
1.281 <Elem>HEADLESS</Elem>
1.282 @@ -5988,7 +5988,7 @@
1.283 <incDir>
1.284 <pElem>../../jdk/src/share/native/sun/java2d</pElem>
1.285 <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
1.286 - <pElem>../../jdk/makefiles</pElem>
1.287 + <pElem>../../jdk/make</pElem>
1.288 </incDir>
1.289 </cTool>
1.290 </folder>
1.291 @@ -6011,7 +6011,7 @@
1.292 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.293 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.294 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.295 - <pElem>../../jdk/makefiles</pElem>
1.296 + <pElem>../../jdk/make</pElem>
1.297 </incDir>
1.298 <preprocessorList>
1.299 <Elem>INTERNAL_BUILD</Elem>
1.300 @@ -6041,7 +6041,7 @@
1.301 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.302 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.303 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.304 - <pElem>../../jdk/makefiles</pElem>
1.305 + <pElem>../../jdk/make</pElem>
1.306 </incDir>
1.307 <preprocessorList>
1.308 <Elem>INTERNAL_BUILD</Elem>
1.309 @@ -6072,7 +6072,7 @@
1.310 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.311 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.312 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.313 - <pElem>../../jdk/makefiles</pElem>
1.314 + <pElem>../../jdk/make</pElem>
1.315 </incDir>
1.316 <preprocessorList>
1.317 <Elem>INTERNAL_BUILD</Elem>
1.318 @@ -6094,7 +6094,7 @@
1.319 <pElem>../../jdk/src/solaris/native/common</pElem>
1.320 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.321 <pElem>../../jdk/src/share/native/sun/management</pElem>
1.322 - <pElem>../../jdk/makefiles</pElem>
1.323 + <pElem>../../jdk/make</pElem>
1.324 </incDir>
1.325 <preprocessorList>
1.326 <Elem>ARCH="amd64"</Elem>
1.327 @@ -6136,7 +6136,7 @@
1.328 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.329 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.330 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.331 - <pElem>../../jdk/makefiles</pElem>
1.332 + <pElem>../../jdk/make</pElem>
1.333 </incDir>
1.334 <preprocessorList>
1.335 <Elem>ARCH="amd64"</Elem>
1.336 @@ -6161,7 +6161,7 @@
1.337 <folder path="$SRC/jdk/src/share/native/sun/nio">
1.338 <cTool>
1.339 <incDir>
1.340 - <pElem>../../jdk/makefiles</pElem>
1.341 + <pElem>../../jdk/make</pElem>
1.342 </incDir>
1.343 <preprocessorList>
1.344 <Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
1.345 @@ -6193,7 +6193,7 @@
1.346 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.347 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.348 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.349 - <pElem>../../jdk/makefiles</pElem>
1.350 + <pElem>../../jdk/make</pElem>
1.351 </incDir>
1.352 <preprocessorList>
1.353 <Elem>ARCH="amd64"</Elem>
1.354 @@ -6244,7 +6244,7 @@
1.355 <incDir>
1.356 <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
1.357 <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
1.358 - <pElem>../../jdk/makefiles</pElem>
1.359 + <pElem>../../jdk/make</pElem>
1.360 </incDir>
1.361 <preprocessorList>
1.362 <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
1.363 @@ -6256,7 +6256,7 @@
1.364 <incDir>
1.365 <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
1.366 <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
1.367 - <pElem>../../jdk/makefiles</pElem>
1.368 + <pElem>../../jdk/make</pElem>
1.369 </incDir>
1.370 <preprocessorList>
1.371 <Elem>MP_API_COMPATIBLE</Elem>
1.372 @@ -6269,7 +6269,7 @@
1.373 <incDir>
1.374 <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
1.375 <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
1.376 - <pElem>../../jdk/makefiles</pElem>
1.377 + <pElem>../../jdk/make</pElem>
1.378 </incDir>
1.379 <preprocessorList>
1.380 <Elem>THIS_FILE="GSSLibStub.c"</Elem>
1.381 @@ -6283,7 +6283,7 @@
1.382 <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
1.383 <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
1.384 <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
1.385 - <pElem>../../jdk/makefiles</pElem>
1.386 + <pElem>../../jdk/make</pElem>
1.387 </incDir>
1.388 <preprocessorList>
1.389 <Elem>THIS_FILE="p11_convert.c"</Elem>
1.390 @@ -6296,7 +6296,7 @@
1.391 <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
1.392 <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
1.393 <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
1.394 - <pElem>../../jdk/makefiles</pElem>
1.395 + <pElem>../../jdk/make</pElem>
1.396 </incDir>
1.397 <preprocessorList>
1.398 <Elem>THIS_FILE="pcsc.c"</Elem>
1.399 @@ -6315,7 +6315,7 @@
1.400 <pElem>../../jdk/src/solaris/native/common</pElem>
1.401 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.402 <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
1.403 - <pElem>../../jdk/makefiles</pElem>
1.404 + <pElem>../../jdk/make</pElem>
1.405 </incDir>
1.406 <preprocessorList>
1.407 <Elem>ARCH="amd64"</Elem>
1.408 @@ -6344,7 +6344,7 @@
1.409 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.410 <pElem>../../jdk/src/share/npt</pElem>
1.411 <pElem>../../jdk/src/solaris/npt</pElem>
1.412 - <pElem>../../jdk/makefiles</pElem>
1.413 + <pElem>../../jdk/make</pElem>
1.414 </incDir>
1.415 <preprocessorList>
1.416 <Elem>ARCH="amd64"</Elem>
1.417 @@ -6375,7 +6375,7 @@
1.418 <pElem>../../jdk/src/solaris/transport/socket</pElem>
1.419 <pElem>../../jdk/src/share/back/export</pElem>
1.420 <pElem>../../jdk/src/share/back</pElem>
1.421 - <pElem>../../jdk/makefiles</pElem>
1.422 + <pElem>../../jdk/make</pElem>
1.423 </incDir>
1.424 <preprocessorList>
1.425 <Elem>ARCH="amd64"</Elem>
1.426 @@ -6427,7 +6427,7 @@
1.427 <pElem>../../jdk/src/share/back</pElem>
1.428 <pElem>../../jdk/src/solaris/back</pElem>
1.429 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
1.430 - <pElem>../../jdk/makefiles</pElem>
1.431 + <pElem>../../jdk/make</pElem>
1.432 </incDir>
1.433 <preprocessorList>
1.434 <Elem>JDWP_LOGGING</Elem>
1.435 @@ -6463,7 +6463,7 @@
1.436 <pElem>../../jdk/src/share/npt</pElem>
1.437 <pElem>../../jdk/src/solaris/npt</pElem>
1.438 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.439 - <pElem>../../jdk/makefiles</pElem>
1.440 + <pElem>../../jdk/make</pElem>
1.441 </incDir>
1.442 <preprocessorList>
1.443 <Elem>THIS_FILE="hprof_md.c"</Elem>
1.444 @@ -6483,7 +6483,7 @@
1.445 <pElem>../../jdk/src/share/instrument</pElem>
1.446 <pElem>../../jdk/src/solaris/instrument</pElem>
1.447 <pElem>../../jdk/src/share/bin</pElem>
1.448 - <pElem>../../jdk/makefiles</pElem>
1.449 + <pElem>../../jdk/make</pElem>
1.450 </incDir>
1.451 <preprocessorList>
1.452 <Elem>NO_JPLIS_LOGGING</Elem>
1.453 @@ -6515,7 +6515,7 @@
1.454 <cTool>
1.455 <incDir>
1.456 <pElem>../../jdk/src/share/native/sun/management</pElem>
1.457 - <pElem>../../jdk/makefiles</pElem>
1.458 + <pElem>../../jdk/make</pElem>
1.459 </incDir>
1.460 </cTool>
1.461 </folder>
1.462 @@ -6524,7 +6524,7 @@
1.463 <incDir>
1.464 <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
1.465 <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
1.466 - <pElem>../../jdk/makefiles</pElem>
1.467 + <pElem>../../jdk/make</pElem>
1.468 </incDir>
1.469 <preprocessorList>
1.470 <Elem>EXTRA_SOUND_JNI_LIBS=" jsoundalsa"</Elem>
1.471 @@ -6541,7 +6541,7 @@
1.472 <folder path="$SRC/jdk/src/solaris/native/com/sun/security">
1.473 <cTool>
1.474 <incDir>
1.475 - <pElem>../../jdk/makefiles</pElem>
1.476 + <pElem>../../jdk/make</pElem>
1.477 </incDir>
1.478 <preprocessorList>
1.479 <Elem>THIS_FILE="Unix.c"</Elem>
1.480 @@ -6573,7 +6573,7 @@
1.481 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.482 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.483 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.484 - <pElem>../../jdk/makefiles</pElem>
1.485 + <pElem>../../jdk/make</pElem>
1.486 </incDir>
1.487 <preprocessorList>
1.488 <Elem>ARCHPROPNAME="amd64"</Elem>
1.489 @@ -6619,7 +6619,7 @@
1.490 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.491 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.492 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.493 - <pElem>../../jdk/makefiles</pElem>
1.494 + <pElem>../../jdk/make</pElem>
1.495 </incDir>
1.496 <preprocessorList>
1.497 <Elem>ARCHPROPNAME="amd64"</Elem>
1.498 @@ -6648,7 +6648,7 @@
1.499 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.500 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.501 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.502 - <pElem>../../jdk/makefiles</pElem>
1.503 + <pElem>../../jdk/make</pElem>
1.504 </incDir>
1.505 <preprocessorList>
1.506 <Elem>ARCHPROPNAME="amd64"</Elem>
1.507 @@ -6668,7 +6668,7 @@
1.508 <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
1.509 <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
1.510 <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
1.511 - <pElem>../../jdk/makefiles</pElem>
1.512 + <pElem>../../jdk/make</pElem>
1.513 </incDir>
1.514 <preprocessorList>
1.515 <Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
1.516 @@ -6682,7 +6682,7 @@
1.517 <pElem>../../jdk/src/share/native/java/io</pElem>
1.518 <pElem>../../jdk/src/share/native/java/net</pElem>
1.519 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.520 - <pElem>../../jdk/makefiles</pElem>
1.521 + <pElem>../../jdk/make</pElem>
1.522 </incDir>
1.523 <preprocessorList>
1.524 <Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
1.525 @@ -6707,7 +6707,7 @@
1.526 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.527 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.528 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.529 - <pElem>../../jdk/makefiles</pElem>
1.530 + <pElem>../../jdk/make</pElem>
1.531 </incDir>
1.532 <preprocessorList>
1.533 <Elem>ARCHPROPNAME="amd64"</Elem>
1.534 @@ -6744,7 +6744,7 @@
1.535 <pElem>../../jdk/src/share/native/common</pElem>
1.536 <pElem>../../jdk/src/solaris/native/common</pElem>
1.537 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.538 - <pElem>../../jdk/makefiles</pElem>
1.539 + <pElem>../../jdk/make</pElem>
1.540 </incDir>
1.541 <preprocessorList>
1.542 <Elem>PNG_NO_MMX_CODE</Elem>
1.543 @@ -6773,7 +6773,7 @@
1.544 <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
1.545 <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
1.546 <pElem>../../jdk/src/share/native/sun/java2d</pElem>
1.547 - <pElem>../../jdk/makefiles</pElem>
1.548 + <pElem>../../jdk/make</pElem>
1.549 </incDir>
1.550 <preprocessorList>
1.551 <Elem>HEADLESS</Elem>
1.552 @@ -6808,7 +6808,7 @@
1.553 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.554 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.555 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.556 - <pElem>../../jdk/makefiles</pElem>
1.557 + <pElem>../../jdk/make</pElem>
1.558 </incDir>
1.559 <preprocessorList>
1.560 <Elem>INTERNAL_BUILD</Elem>
1.561 @@ -6838,7 +6838,7 @@
1.562 <pElem>../../jdk/src/solaris/native/common</pElem>
1.563 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.564 <pElem>../../jdk/src/share/native/sun/management</pElem>
1.565 - <pElem>../../jdk/makefiles</pElem>
1.566 + <pElem>../../jdk/make</pElem>
1.567 </incDir>
1.568 <preprocessorList>
1.569 <Elem>THIS_FILE="FileSystemImpl.c"</Elem>
1.570 @@ -6860,7 +6860,7 @@
1.571 <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
1.572 <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
1.573 <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
1.574 - <pElem>../../jdk/makefiles</pElem>
1.575 + <pElem>../../jdk/make</pElem>
1.576 </incDir>
1.577 <preprocessorList>
1.578 <Elem>THIS_FILE="ResolverConfigurationImpl.c"</Elem>
1.579 @@ -6909,7 +6909,7 @@
1.580 <pElem>../../jdk/src/share/native/java/net</pElem>
1.581 <pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
1.582 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.583 - <pElem>../../jdk/makefiles</pElem>
1.584 + <pElem>../../jdk/make</pElem>
1.585 </incDir>
1.586 </cTool>
1.587 </folder>
1.588 @@ -6941,7 +6941,7 @@
1.589 <incDir>
1.590 <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
1.591 <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
1.592 - <pElem>../../jdk/makefiles</pElem>
1.593 + <pElem>../../jdk/make</pElem>
1.594 </incDir>
1.595 </cTool>
1.596 </folder>
1.597 @@ -6952,7 +6952,7 @@
1.598 <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
1.599 <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
1.600 <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
1.601 - <pElem>../../jdk/makefiles</pElem>
1.602 + <pElem>../../jdk/make</pElem>
1.603 </incDir>
1.604 <preprocessorList>
1.605 <Elem>THIS_FILE="p11_md.c"</Elem>
1.606 @@ -6965,7 +6965,7 @@
1.607 <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
1.608 <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
1.609 <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
1.610 - <pElem>../../jdk/makefiles</pElem>
1.611 + <pElem>../../jdk/make</pElem>
1.612 </incDir>
1.613 <preprocessorList>
1.614 <Elem>THIS_FILE="pcsc_md.c"</Elem>
1.615 @@ -6983,7 +6983,7 @@
1.616 <pElem>../../jdk/src/share/native/common</pElem>
1.617 <pElem>../../jdk/src/solaris/native/common</pElem>
1.618 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.619 - <pElem>../../jdk/makefiles</pElem>
1.620 + <pElem>../../jdk/make</pElem>
1.621 </incDir>
1.622 <preprocessorList>
1.623 <Elem>THIS_FILE="LinuxVirtualMachine.c"</Elem>
1.624 @@ -7001,7 +7001,7 @@
1.625 <pElem>../../jdk/src/solaris/native/common</pElem>
1.626 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.627 <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
1.628 - <pElem>../../jdk/makefiles</pElem>
1.629 + <pElem>../../jdk/make</pElem>
1.630 </incDir>
1.631 <preprocessorList>
1.632 <Elem>THIS_FILE="jvm_symbols_md.c"</Elem>
1.633 @@ -7033,7 +7033,7 @@
1.634 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.635 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.636 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.637 - <pElem>../../jdk/makefiles</pElem>
1.638 + <pElem>../../jdk/make</pElem>
1.639 </incDir>
1.640 <preprocessorList>
1.641 <Elem>ARCHPROPNAME="amd64"</Elem>
1.642 @@ -7071,7 +7071,7 @@
1.643 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.644 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.645 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.646 - <pElem>../../jdk/makefiles</pElem>
1.647 + <pElem>../../jdk/make</pElem>
1.648 </incDir>
1.649 <preprocessorList>
1.650 <Elem>INTERNAL_BUILD</Elem>
1.651 @@ -7095,7 +7095,7 @@
1.652 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.653 <pElem>../../jdk/src/share/npt</pElem>
1.654 <pElem>../../jdk/src/solaris/npt</pElem>
1.655 - <pElem>../../jdk/makefiles</pElem>
1.656 + <pElem>../../jdk/make</pElem>
1.657 </incDir>
1.658 <preprocessorList>
1.659 <Elem>THIS_FILE="utf_md.c"</Elem>
1.660 @@ -7116,7 +7116,7 @@
1.661 <pElem>../../jdk/src/solaris/transport/socket</pElem>
1.662 <pElem>../../jdk/src/share/back/export</pElem>
1.663 <pElem>../../jdk/src/share/back</pElem>
1.664 - <pElem>../../jdk/makefiles</pElem>
1.665 + <pElem>../../jdk/make</pElem>
1.666 </incDir>
1.667 <preprocessorList>
1.668 <Elem>THIS_FILE="socket_md.c"</Elem>
1.669 @@ -10455,7 +10455,7 @@
1.670 <pElem>../../jdk/src/share/bin</pElem>
1.671 <pElem>../../jdk/src/solaris/bin</pElem>
1.672 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.673 - <pElem>../../jdk/makefiles</pElem>
1.674 + <pElem>../../jdk/make</pElem>
1.675 </incDir>
1.676 </cTool>
1.677 </item>
1.678 @@ -10466,7 +10466,7 @@
1.679 <pElem>../../jdk/src/share/bin</pElem>
1.680 <pElem>../../jdk/src/solaris/bin</pElem>
1.681 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.682 - <pElem>../../jdk/makefiles</pElem>
1.683 + <pElem>../../jdk/make</pElem>
1.684 </incDir>
1.685 <preprocessorList>
1.686 <Elem>THIS_FILE="jli_util.c"</Elem>
1.687 @@ -10479,7 +10479,7 @@
1.688 <pElem>../../jdk/src/share/bin</pElem>
1.689 <pElem>../../jdk/src/solaris/bin</pElem>
1.690 <pElem>../../jdk/src/linux/bin</pElem>
1.691 - <pElem>../../jdk/makefiles</pElem>
1.692 + <pElem>../../jdk/make</pElem>
1.693 </incDir>
1.694 <preprocessorList>
1.695 <Elem>EXPAND_CLASSPATH_WILDCARDS</Elem>
1.696 @@ -10504,7 +10504,7 @@
1.697 <pElem>../../jdk/src/share/bin</pElem>
1.698 <pElem>../../jdk/src/solaris/bin</pElem>
1.699 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.700 - <pElem>../../jdk/makefiles</pElem>
1.701 + <pElem>../../jdk/make</pElem>
1.702 </incDir>
1.703 <preprocessorList>
1.704 <Elem>THIS_FILE="parse_manifest.c"</Elem>
1.705 @@ -10521,7 +10521,7 @@
1.706 <pElem>../../jdk/src/share/bin</pElem>
1.707 <pElem>../../jdk/src/solaris/bin</pElem>
1.708 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.709 - <pElem>../../jdk/makefiles</pElem>
1.710 + <pElem>../../jdk/make</pElem>
1.711 </incDir>
1.712 <preprocessorList>
1.713 <Elem>THIS_FILE="splashscreen_stubs.c"</Elem>
1.714 @@ -10538,7 +10538,7 @@
1.715 <pElem>../../jdk/src/share/bin</pElem>
1.716 <pElem>../../jdk/src/solaris/bin</pElem>
1.717 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.718 - <pElem>../../jdk/makefiles</pElem>
1.719 + <pElem>../../jdk/make</pElem>
1.720 </incDir>
1.721 <preprocessorList>
1.722 <Elem>THIS_FILE="version_comp.c"</Elem>
1.723 @@ -10552,7 +10552,7 @@
1.724 <pElem>../../jdk/src/share/bin</pElem>
1.725 <pElem>../../jdk/src/solaris/bin</pElem>
1.726 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.727 - <pElem>../../jdk/makefiles</pElem>
1.728 + <pElem>../../jdk/make</pElem>
1.729 </incDir>
1.730 <preprocessorList>
1.731 <Elem>THIS_FILE="wildcard.c"</Elem>
1.732 @@ -10992,7 +10992,7 @@
1.733 <pElem>../../jdk/src/share/native/common</pElem>
1.734 <pElem>../../jdk/src/solaris/native/common</pElem>
1.735 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.736 - <pElem>../../jdk/makefiles</pElem>
1.737 + <pElem>../../jdk/make</pElem>
1.738 </incDir>
1.739 <preprocessorList>
1.740 <Elem>NO_ZLIB</Elem>
1.741 @@ -11013,7 +11013,7 @@
1.742 <pElem>../../jdk/src/share/native/common</pElem>
1.743 <pElem>../../jdk/src/solaris/native/common</pElem>
1.744 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.745 - <pElem>../../jdk/makefiles</pElem>
1.746 + <pElem>../../jdk/make</pElem>
1.747 </incDir>
1.748 <preprocessorList>
1.749 <Elem>NO_ZLIB</Elem>
1.750 @@ -11035,7 +11035,7 @@
1.751 <pElem>../../jdk/src/share/native/common</pElem>
1.752 <pElem>../../jdk/src/solaris/native/common</pElem>
1.753 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.754 - <pElem>../../jdk/makefiles</pElem>
1.755 + <pElem>../../jdk/make</pElem>
1.756 </incDir>
1.757 <preprocessorList>
1.758 <Elem>NO_ZLIB</Elem>
1.759 @@ -11057,7 +11057,7 @@
1.760 <pElem>../../jdk/src/share/native/common</pElem>
1.761 <pElem>../../jdk/src/solaris/native/common</pElem>
1.762 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.763 - <pElem>../../jdk/makefiles</pElem>
1.764 + <pElem>../../jdk/make</pElem>
1.765 </incDir>
1.766 <preprocessorList>
1.767 <Elem>NO_ZLIB</Elem>
1.768 @@ -11079,7 +11079,7 @@
1.769 <pElem>../../jdk/src/solaris/javavm/export</pElem>
1.770 <pElem>../../jdk/src/share/native/common</pElem>
1.771 <pElem>../../jdk/src/solaris/native/common</pElem>
1.772 - <pElem>../../jdk/makefiles</pElem>
1.773 + <pElem>../../jdk/make</pElem>
1.774 </incDir>
1.775 <preprocessorList>
1.776 <Elem>THIS_FILE="main.cpp"</Elem>
1.777 @@ -11099,7 +11099,7 @@
1.778 <pElem>../../jdk/src/share/native/common</pElem>
1.779 <pElem>../../jdk/src/solaris/native/common</pElem>
1.780 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.781 - <pElem>../../jdk/makefiles</pElem>
1.782 + <pElem>../../jdk/make</pElem>
1.783 </incDir>
1.784 <preprocessorList>
1.785 <Elem>NO_ZLIB</Elem>
1.786 @@ -11121,7 +11121,7 @@
1.787 <pElem>../../jdk/src/share/native/common</pElem>
1.788 <pElem>../../jdk/src/solaris/native/common</pElem>
1.789 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.790 - <pElem>../../jdk/makefiles</pElem>
1.791 + <pElem>../../jdk/make</pElem>
1.792 </incDir>
1.793 <preprocessorList>
1.794 <Elem>NO_ZLIB</Elem>
1.795 @@ -11143,7 +11143,7 @@
1.796 <pElem>../../jdk/src/share/native/common</pElem>
1.797 <pElem>../../jdk/src/solaris/native/common</pElem>
1.798 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.799 - <pElem>../../jdk/makefiles</pElem>
1.800 + <pElem>../../jdk/make</pElem>
1.801 </incDir>
1.802 <preprocessorList>
1.803 <Elem>NO_ZLIB</Elem>
1.804 @@ -11307,7 +11307,7 @@
1.805 flavor2="0">
1.806 <cTool>
1.807 <incDir>
1.808 - <pElem>../../jdk/makefiles</pElem>
1.809 + <pElem>../../jdk/make</pElem>
1.810 </incDir>
1.811 </cTool>
1.812 </item>
1.813 @@ -11317,7 +11317,7 @@
1.814 flavor2="0">
1.815 <cTool>
1.816 <incDir>
1.817 - <pElem>../../jdk/makefiles</pElem>
1.818 + <pElem>../../jdk/make</pElem>
1.819 </incDir>
1.820 <preprocessorList>
1.821 <Elem>THIS_FILE="check_format.c"</Elem>
1.822 @@ -11345,7 +11345,7 @@
1.823 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.824 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.825 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.826 - <pElem>../../jdk/makefiles</pElem>
1.827 + <pElem>../../jdk/make</pElem>
1.828 </incDir>
1.829 <preprocessorList>
1.830 <Elem>ARCHPROPNAME="amd64"</Elem>
1.831 @@ -11378,7 +11378,7 @@
1.832 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.833 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.834 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.835 - <pElem>../../jdk/makefiles</pElem>
1.836 + <pElem>../../jdk/make</pElem>
1.837 </incDir>
1.838 <preprocessorList>
1.839 <Elem>ARCHPROPNAME="amd64"</Elem>
1.840 @@ -11411,7 +11411,7 @@
1.841 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.842 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.843 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.844 - <pElem>../../jdk/makefiles</pElem>
1.845 + <pElem>../../jdk/make</pElem>
1.846 </incDir>
1.847 <preprocessorList>
1.848 <Elem>ARCHPROPNAME="amd64"</Elem>
1.849 @@ -11444,7 +11444,7 @@
1.850 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.851 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.852 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.853 - <pElem>../../jdk/makefiles</pElem>
1.854 + <pElem>../../jdk/make</pElem>
1.855 </incDir>
1.856 <preprocessorList>
1.857 <Elem>ARCHPROPNAME="amd64"</Elem>
1.858 @@ -11477,7 +11477,7 @@
1.859 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.860 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.861 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.862 - <pElem>../../jdk/makefiles</pElem>
1.863 + <pElem>../../jdk/make</pElem>
1.864 </incDir>
1.865 <preprocessorList>
1.866 <Elem>ARCHPROPNAME="amd64"</Elem>
1.867 @@ -11565,7 +11565,7 @@
1.868 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.869 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.870 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.871 - <pElem>../../jdk/makefiles</pElem>
1.872 + <pElem>../../jdk/make</pElem>
1.873 </incDir>
1.874 <preprocessorList>
1.875 <Elem>ARCHPROPNAME="amd64"</Elem>
1.876 @@ -11598,7 +11598,7 @@
1.877 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.878 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.879 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.880 - <pElem>../../jdk/makefiles</pElem>
1.881 + <pElem>../../jdk/make</pElem>
1.882 </incDir>
1.883 <preprocessorList>
1.884 <Elem>ARCHPROPNAME="amd64"</Elem>
1.885 @@ -11631,7 +11631,7 @@
1.886 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.887 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.888 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.889 - <pElem>../../jdk/makefiles</pElem>
1.890 + <pElem>../../jdk/make</pElem>
1.891 </incDir>
1.892 <preprocessorList>
1.893 <Elem>ARCHPROPNAME="amd64"</Elem>
1.894 @@ -11664,7 +11664,7 @@
1.895 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.896 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.897 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.898 - <pElem>../../jdk/makefiles</pElem>
1.899 + <pElem>../../jdk/make</pElem>
1.900 </incDir>
1.901 <preprocessorList>
1.902 <Elem>ARCHPROPNAME="amd64"</Elem>
1.903 @@ -11697,7 +11697,7 @@
1.904 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.905 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.906 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.907 - <pElem>../../jdk/makefiles</pElem>
1.908 + <pElem>../../jdk/make</pElem>
1.909 </incDir>
1.910 <preprocessorList>
1.911 <Elem>ARCHPROPNAME="amd64"</Elem>
1.912 @@ -11730,7 +11730,7 @@
1.913 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.914 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.915 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.916 - <pElem>../../jdk/makefiles</pElem>
1.917 + <pElem>../../jdk/make</pElem>
1.918 </incDir>
1.919 <preprocessorList>
1.920 <Elem>ARCHPROPNAME="amd64"</Elem>
1.921 @@ -11763,7 +11763,7 @@
1.922 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.923 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.924 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.925 - <pElem>../../jdk/makefiles</pElem>
1.926 + <pElem>../../jdk/make</pElem>
1.927 </incDir>
1.928 <preprocessorList>
1.929 <Elem>ARCHPROPNAME="amd64"</Elem>
1.930 @@ -11796,7 +11796,7 @@
1.931 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.932 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.933 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.934 - <pElem>../../jdk/makefiles</pElem>
1.935 + <pElem>../../jdk/make</pElem>
1.936 </incDir>
1.937 <preprocessorList>
1.938 <Elem>ARCHPROPNAME="amd64"</Elem>
1.939 @@ -11829,7 +11829,7 @@
1.940 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.941 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.942 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.943 - <pElem>../../jdk/makefiles</pElem>
1.944 + <pElem>../../jdk/make</pElem>
1.945 </incDir>
1.946 <preprocessorList>
1.947 <Elem>ARCHPROPNAME="amd64"</Elem>
1.948 @@ -11862,7 +11862,7 @@
1.949 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.950 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.951 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.952 - <pElem>../../jdk/makefiles</pElem>
1.953 + <pElem>../../jdk/make</pElem>
1.954 </incDir>
1.955 <preprocessorList>
1.956 <Elem>ARCHPROPNAME="amd64"</Elem>
1.957 @@ -11895,7 +11895,7 @@
1.958 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.959 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.960 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.961 - <pElem>../../jdk/makefiles</pElem>
1.962 + <pElem>../../jdk/make</pElem>
1.963 </incDir>
1.964 <preprocessorList>
1.965 <Elem>ARCHPROPNAME="amd64"</Elem>
1.966 @@ -11928,7 +11928,7 @@
1.967 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.968 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.969 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.970 - <pElem>../../jdk/makefiles</pElem>
1.971 + <pElem>../../jdk/make</pElem>
1.972 </incDir>
1.973 <preprocessorList>
1.974 <Elem>ARCHPROPNAME="amd64"</Elem>
1.975 @@ -11961,7 +11961,7 @@
1.976 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.977 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.978 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.979 - <pElem>../../jdk/makefiles</pElem>
1.980 + <pElem>../../jdk/make</pElem>
1.981 </incDir>
1.982 <preprocessorList>
1.983 <Elem>ARCHPROPNAME="amd64"</Elem>
1.984 @@ -11994,7 +11994,7 @@
1.985 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.986 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.987 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.988 - <pElem>../../jdk/makefiles</pElem>
1.989 + <pElem>../../jdk/make</pElem>
1.990 </incDir>
1.991 <preprocessorList>
1.992 <Elem>ARCHPROPNAME="amd64"</Elem>
1.993 @@ -12027,7 +12027,7 @@
1.994 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.995 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.996 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.997 - <pElem>../../jdk/makefiles</pElem>
1.998 + <pElem>../../jdk/make</pElem>
1.999 </incDir>
1.1000 <preprocessorList>
1.1001 <Elem>ARCHPROPNAME="amd64"</Elem>
1.1002 @@ -12060,7 +12060,7 @@
1.1003 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.1004 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.1005 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.1006 - <pElem>../../jdk/makefiles</pElem>
1.1007 + <pElem>../../jdk/make</pElem>
1.1008 </incDir>
1.1009 <preprocessorList>
1.1010 <Elem>ARCHPROPNAME="amd64"</Elem>
1.1011 @@ -12800,7 +12800,7 @@
1.1012 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.1013 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.1014 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.1015 - <pElem>../../jdk/makefiles</pElem>
1.1016 + <pElem>../../jdk/make</pElem>
1.1017 </incDir>
1.1018 <preprocessorList>
1.1019 <Elem>ARCHPROPNAME="amd64"</Elem>
1.1020 @@ -12833,7 +12833,7 @@
1.1021 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.1022 <pElem>../../jdk/src/share/native/java/io</pElem>
1.1023 <pElem>../../jdk/src/solaris/native/java/io</pElem>
1.1024 - <pElem>../../jdk/makefiles</pElem>
1.1025 + <pElem>../../jdk/make</pElem>
1.1026 </incDir>
1.1027 <preprocessorList>
1.1028 <Elem>THIS_FILE="Adler32.c"</Elem>
1.1029 @@ -12860,7 +12860,7 @@
1.1030 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.1031 <pElem>../../jdk/src/share/native/java/io</pElem>
1.1032 <pElem>../../jdk/src/solaris/native/java/io</pElem>
1.1033 - <pElem>../../jdk/makefiles</pElem>
1.1034 + <pElem>../../jdk/make</pElem>
1.1035 </incDir>
1.1036 <preprocessorList>
1.1037 <Elem>THIS_FILE="CRC32.c"</Elem>
1.1038 @@ -12887,7 +12887,7 @@
1.1039 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.1040 <pElem>../../jdk/src/share/native/java/io</pElem>
1.1041 <pElem>../../jdk/src/solaris/native/java/io</pElem>
1.1042 - <pElem>../../jdk/makefiles</pElem>
1.1043 + <pElem>../../jdk/make</pElem>
1.1044 </incDir>
1.1045 <preprocessorList>
1.1046 <Elem>THIS_FILE="Deflater.c"</Elem>
1.1047 @@ -12914,7 +12914,7 @@
1.1048 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.1049 <pElem>../../jdk/src/share/native/java/io</pElem>
1.1050 <pElem>../../jdk/src/solaris/native/java/io</pElem>
1.1051 - <pElem>../../jdk/makefiles</pElem>
1.1052 + <pElem>../../jdk/make</pElem>
1.1053 </incDir>
1.1054 <preprocessorList>
1.1055 <Elem>THIS_FILE="Inflater.c"</Elem>
1.1056 @@ -12941,7 +12941,7 @@
1.1057 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.1058 <pElem>../../jdk/src/share/native/java/io</pElem>
1.1059 <pElem>../../jdk/src/solaris/native/java/io</pElem>
1.1060 - <pElem>../../jdk/makefiles</pElem>
1.1061 + <pElem>../../jdk/make</pElem>
1.1062 </incDir>
1.1063 <preprocessorList>
1.1064 <Elem>THIS_FILE="ZipFile.c"</Elem>
1.1065 @@ -12968,7 +12968,7 @@
1.1066 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.1067 <pElem>../../jdk/src/share/native/java/io</pElem>
1.1068 <pElem>../../jdk/src/solaris/native/java/io</pElem>
1.1069 - <pElem>../../jdk/makefiles</pElem>
1.1070 + <pElem>../../jdk/make</pElem>
1.1071 </incDir>
1.1072 <preprocessorList>
1.1073 <Elem>THIS_FILE="zip_util.c"</Elem>
1.1074 @@ -13213,7 +13213,7 @@
1.1075 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.1076 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.1077 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.1078 - <pElem>../../jdk/makefiles</pElem>
1.1079 + <pElem>../../jdk/make</pElem>
1.1080 </incDir>
1.1081 <preprocessorList>
1.1082 <Elem>INTERNAL_BUILD</Elem>
1.1083 @@ -13253,7 +13253,7 @@
1.1084 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.1085 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.1086 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.1087 - <pElem>../../jdk/makefiles</pElem>
1.1088 + <pElem>../../jdk/make</pElem>
1.1089 </incDir>
1.1090 <preprocessorList>
1.1091 <Elem>INTERNAL_BUILD</Elem>
1.1092 @@ -13293,7 +13293,7 @@
1.1093 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.1094 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.1095 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.1096 - <pElem>../../jdk/makefiles</pElem>
1.1097 + <pElem>../../jdk/make</pElem>
1.1098 </incDir>
1.1099 <preprocessorList>
1.1100 <Elem>INTERNAL_BUILD</Elem>
1.1101 @@ -13333,7 +13333,7 @@
1.1102 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.1103 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.1104 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.1105 - <pElem>../../jdk/makefiles</pElem>
1.1106 + <pElem>../../jdk/make</pElem>
1.1107 </incDir>
1.1108 <preprocessorList>
1.1109 <Elem>INTERNAL_BUILD</Elem>
1.1110 @@ -13388,7 +13388,7 @@
1.1111 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.1112 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.1113 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.1114 - <pElem>../../jdk/makefiles</pElem>
1.1115 + <pElem>../../jdk/make</pElem>
1.1116 </incDir>
1.1117 <preprocessorList>
1.1118 <Elem>INTERNAL_BUILD</Elem>
1.1119 @@ -13433,7 +13433,7 @@
1.1120 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.1121 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.1122 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.1123 - <pElem>../../jdk/makefiles</pElem>
1.1124 + <pElem>../../jdk/make</pElem>
1.1125 </incDir>
1.1126 <preprocessorList>
1.1127 <Elem>INTERNAL_BUILD</Elem>
1.1128 @@ -13458,7 +13458,7 @@
1.1129 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1130 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1131 <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
1.1132 - <pElem>../../jdk/makefiles</pElem>
1.1133 + <pElem>../../jdk/make</pElem>
1.1134 </incDir>
1.1135 </cTool>
1.1136 </item>
1.1137 @@ -13483,7 +13483,7 @@
1.1138 <pElem>../../jdk/src/share/native/common</pElem>
1.1139 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1140 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1141 - <pElem>../../jdk/makefiles</pElem>
1.1142 + <pElem>../../jdk/make</pElem>
1.1143 </incDir>
1.1144 <preprocessorList>
1.1145 <Elem>PNG_NO_MMX_CODE</Elem>
1.1146 @@ -13514,7 +13514,7 @@
1.1147 <pElem>../../jdk/src/share/native/common</pElem>
1.1148 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1149 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1150 - <pElem>../../jdk/makefiles</pElem>
1.1151 + <pElem>../../jdk/make</pElem>
1.1152 </incDir>
1.1153 <preprocessorList>
1.1154 <Elem>PNG_NO_MMX_CODE</Elem>
1.1155 @@ -13545,7 +13545,7 @@
1.1156 <pElem>../../jdk/src/share/native/common</pElem>
1.1157 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1158 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1159 - <pElem>../../jdk/makefiles</pElem>
1.1160 + <pElem>../../jdk/make</pElem>
1.1161 </incDir>
1.1162 <preprocessorList>
1.1163 <Elem>PNG_NO_MMX_CODE</Elem>
1.1164 @@ -13576,7 +13576,7 @@
1.1165 <pElem>../../jdk/src/share/native/common</pElem>
1.1166 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1167 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1168 - <pElem>../../jdk/makefiles</pElem>
1.1169 + <pElem>../../jdk/make</pElem>
1.1170 </incDir>
1.1171 <preprocessorList>
1.1172 <Elem>PNG_NO_MMX_CODE</Elem>
1.1173 @@ -13607,7 +13607,7 @@
1.1174 <pElem>../../jdk/src/share/native/common</pElem>
1.1175 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1176 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1177 - <pElem>../../jdk/makefiles</pElem>
1.1178 + <pElem>../../jdk/make</pElem>
1.1179 </incDir>
1.1180 <preprocessorList>
1.1181 <Elem>PNG_NO_MMX_CODE</Elem>
1.1182 @@ -13638,7 +13638,7 @@
1.1183 <pElem>../../jdk/src/share/native/common</pElem>
1.1184 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1185 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1186 - <pElem>../../jdk/makefiles</pElem>
1.1187 + <pElem>../../jdk/make</pElem>
1.1188 </incDir>
1.1189 <preprocessorList>
1.1190 <Elem>PNG_NO_MMX_CODE</Elem>
1.1191 @@ -13669,7 +13669,7 @@
1.1192 <pElem>../../jdk/src/share/native/common</pElem>
1.1193 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1194 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1195 - <pElem>../../jdk/makefiles</pElem>
1.1196 + <pElem>../../jdk/make</pElem>
1.1197 </incDir>
1.1198 <preprocessorList>
1.1199 <Elem>PNG_NO_MMX_CODE</Elem>
1.1200 @@ -13700,7 +13700,7 @@
1.1201 <pElem>../../jdk/src/share/native/common</pElem>
1.1202 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1203 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1204 - <pElem>../../jdk/makefiles</pElem>
1.1205 + <pElem>../../jdk/make</pElem>
1.1206 </incDir>
1.1207 <preprocessorList>
1.1208 <Elem>PNG_NO_MMX_CODE</Elem>
1.1209 @@ -13731,7 +13731,7 @@
1.1210 <pElem>../../jdk/src/share/native/common</pElem>
1.1211 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1212 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1213 - <pElem>../../jdk/makefiles</pElem>
1.1214 + <pElem>../../jdk/make</pElem>
1.1215 </incDir>
1.1216 <preprocessorList>
1.1217 <Elem>PNG_NO_MMX_CODE</Elem>
1.1218 @@ -13762,7 +13762,7 @@
1.1219 <pElem>../../jdk/src/share/native/common</pElem>
1.1220 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1221 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1222 - <pElem>../../jdk/makefiles</pElem>
1.1223 + <pElem>../../jdk/make</pElem>
1.1224 </incDir>
1.1225 <preprocessorList>
1.1226 <Elem>PNG_NO_MMX_CODE</Elem>
1.1227 @@ -13793,7 +13793,7 @@
1.1228 <pElem>../../jdk/src/share/native/common</pElem>
1.1229 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1230 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1231 - <pElem>../../jdk/makefiles</pElem>
1.1232 + <pElem>../../jdk/make</pElem>
1.1233 </incDir>
1.1234 <preprocessorList>
1.1235 <Elem>PNG_NO_MMX_CODE</Elem>
1.1236 @@ -13824,7 +13824,7 @@
1.1237 <pElem>../../jdk/src/share/native/common</pElem>
1.1238 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1239 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1240 - <pElem>../../jdk/makefiles</pElem>
1.1241 + <pElem>../../jdk/make</pElem>
1.1242 </incDir>
1.1243 <preprocessorList>
1.1244 <Elem>PNG_NO_MMX_CODE</Elem>
1.1245 @@ -13855,7 +13855,7 @@
1.1246 <pElem>../../jdk/src/share/native/common</pElem>
1.1247 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1248 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1249 - <pElem>../../jdk/makefiles</pElem>
1.1250 + <pElem>../../jdk/make</pElem>
1.1251 </incDir>
1.1252 <preprocessorList>
1.1253 <Elem>PNG_NO_MMX_CODE</Elem>
1.1254 @@ -13886,7 +13886,7 @@
1.1255 <pElem>../../jdk/src/share/native/common</pElem>
1.1256 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1257 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1258 - <pElem>../../jdk/makefiles</pElem>
1.1259 + <pElem>../../jdk/make</pElem>
1.1260 </incDir>
1.1261 <preprocessorList>
1.1262 <Elem>PNG_NO_MMX_CODE</Elem>
1.1263 @@ -13917,7 +13917,7 @@
1.1264 <pElem>../../jdk/src/share/native/common</pElem>
1.1265 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1266 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1267 - <pElem>../../jdk/makefiles</pElem>
1.1268 + <pElem>../../jdk/make</pElem>
1.1269 </incDir>
1.1270 <preprocessorList>
1.1271 <Elem>PNG_NO_MMX_CODE</Elem>
1.1272 @@ -13948,7 +13948,7 @@
1.1273 <pElem>../../jdk/src/share/native/common</pElem>
1.1274 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1275 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1276 - <pElem>../../jdk/makefiles</pElem>
1.1277 + <pElem>../../jdk/make</pElem>
1.1278 </incDir>
1.1279 <preprocessorList>
1.1280 <Elem>PNG_NO_MMX_CODE</Elem>
1.1281 @@ -13979,7 +13979,7 @@
1.1282 <pElem>../../jdk/src/share/native/common</pElem>
1.1283 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1284 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1285 - <pElem>../../jdk/makefiles</pElem>
1.1286 + <pElem>../../jdk/make</pElem>
1.1287 </incDir>
1.1288 <preprocessorList>
1.1289 <Elem>PNG_NO_MMX_CODE</Elem>
1.1290 @@ -14010,7 +14010,7 @@
1.1291 <pElem>../../jdk/src/share/native/common</pElem>
1.1292 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1293 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1294 - <pElem>../../jdk/makefiles</pElem>
1.1295 + <pElem>../../jdk/make</pElem>
1.1296 </incDir>
1.1297 <preprocessorList>
1.1298 <Elem>PNG_NO_MMX_CODE</Elem>
1.1299 @@ -14041,7 +14041,7 @@
1.1300 <pElem>../../jdk/src/share/native/common</pElem>
1.1301 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1302 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1303 - <pElem>../../jdk/makefiles</pElem>
1.1304 + <pElem>../../jdk/make</pElem>
1.1305 </incDir>
1.1306 <preprocessorList>
1.1307 <Elem>PNG_NO_MMX_CODE</Elem>
1.1308 @@ -14072,7 +14072,7 @@
1.1309 <pElem>../../jdk/src/share/native/common</pElem>
1.1310 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1311 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1312 - <pElem>../../jdk/makefiles</pElem>
1.1313 + <pElem>../../jdk/make</pElem>
1.1314 </incDir>
1.1315 <preprocessorList>
1.1316 <Elem>PNG_NO_MMX_CODE</Elem>
1.1317 @@ -14103,7 +14103,7 @@
1.1318 <pElem>../../jdk/src/share/native/common</pElem>
1.1319 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1320 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1321 - <pElem>../../jdk/makefiles</pElem>
1.1322 + <pElem>../../jdk/make</pElem>
1.1323 </incDir>
1.1324 <preprocessorList>
1.1325 <Elem>PNG_NO_MMX_CODE</Elem>
1.1326 @@ -14134,7 +14134,7 @@
1.1327 <pElem>../../jdk/src/share/native/common</pElem>
1.1328 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1329 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1330 - <pElem>../../jdk/makefiles</pElem>
1.1331 + <pElem>../../jdk/make</pElem>
1.1332 </incDir>
1.1333 <preprocessorList>
1.1334 <Elem>PNG_NO_MMX_CODE</Elem>
1.1335 @@ -14165,7 +14165,7 @@
1.1336 <pElem>../../jdk/src/share/native/common</pElem>
1.1337 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1338 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1339 - <pElem>../../jdk/makefiles</pElem>
1.1340 + <pElem>../../jdk/make</pElem>
1.1341 </incDir>
1.1342 <preprocessorList>
1.1343 <Elem>PNG_NO_MMX_CODE</Elem>
1.1344 @@ -14196,7 +14196,7 @@
1.1345 <pElem>../../jdk/src/share/native/common</pElem>
1.1346 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1347 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1348 - <pElem>../../jdk/makefiles</pElem>
1.1349 + <pElem>../../jdk/make</pElem>
1.1350 </incDir>
1.1351 <preprocessorList>
1.1352 <Elem>PNG_NO_MMX_CODE</Elem>
1.1353 @@ -14227,7 +14227,7 @@
1.1354 <pElem>../../jdk/src/share/native/common</pElem>
1.1355 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1356 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1357 - <pElem>../../jdk/makefiles</pElem>
1.1358 + <pElem>../../jdk/make</pElem>
1.1359 </incDir>
1.1360 <preprocessorList>
1.1361 <Elem>PNG_NO_MMX_CODE</Elem>
1.1362 @@ -14258,7 +14258,7 @@
1.1363 <pElem>../../jdk/src/share/native/common</pElem>
1.1364 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1365 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1366 - <pElem>../../jdk/makefiles</pElem>
1.1367 + <pElem>../../jdk/make</pElem>
1.1368 </incDir>
1.1369 <preprocessorList>
1.1370 <Elem>PNG_NO_MMX_CODE</Elem>
1.1371 @@ -14289,7 +14289,7 @@
1.1372 <pElem>../../jdk/src/share/native/common</pElem>
1.1373 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1374 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1375 - <pElem>../../jdk/makefiles</pElem>
1.1376 + <pElem>../../jdk/make</pElem>
1.1377 </incDir>
1.1378 <preprocessorList>
1.1379 <Elem>PNG_NO_MMX_CODE</Elem>
1.1380 @@ -14320,7 +14320,7 @@
1.1381 <pElem>../../jdk/src/share/native/common</pElem>
1.1382 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1383 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1384 - <pElem>../../jdk/makefiles</pElem>
1.1385 + <pElem>../../jdk/make</pElem>
1.1386 </incDir>
1.1387 <preprocessorList>
1.1388 <Elem>PNG_NO_MMX_CODE</Elem>
1.1389 @@ -14351,7 +14351,7 @@
1.1390 <pElem>../../jdk/src/share/native/common</pElem>
1.1391 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1392 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1393 - <pElem>../../jdk/makefiles</pElem>
1.1394 + <pElem>../../jdk/make</pElem>
1.1395 </incDir>
1.1396 <preprocessorList>
1.1397 <Elem>PNG_NO_MMX_CODE</Elem>
1.1398 @@ -14382,7 +14382,7 @@
1.1399 <pElem>../../jdk/src/share/native/common</pElem>
1.1400 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1401 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1402 - <pElem>../../jdk/makefiles</pElem>
1.1403 + <pElem>../../jdk/make</pElem>
1.1404 </incDir>
1.1405 <preprocessorList>
1.1406 <Elem>PNG_NO_MMX_CODE</Elem>
1.1407 @@ -14413,7 +14413,7 @@
1.1408 <pElem>../../jdk/src/share/native/common</pElem>
1.1409 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1410 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1411 - <pElem>../../jdk/makefiles</pElem>
1.1412 + <pElem>../../jdk/make</pElem>
1.1413 </incDir>
1.1414 <preprocessorList>
1.1415 <Elem>PNG_NO_MMX_CODE</Elem>
1.1416 @@ -14444,7 +14444,7 @@
1.1417 <pElem>../../jdk/src/share/native/common</pElem>
1.1418 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1419 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1420 - <pElem>../../jdk/makefiles</pElem>
1.1421 + <pElem>../../jdk/make</pElem>
1.1422 </incDir>
1.1423 <preprocessorList>
1.1424 <Elem>PNG_NO_MMX_CODE</Elem>
1.1425 @@ -14475,7 +14475,7 @@
1.1426 <pElem>../../jdk/src/share/native/common</pElem>
1.1427 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1428 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1429 - <pElem>../../jdk/makefiles</pElem>
1.1430 + <pElem>../../jdk/make</pElem>
1.1431 </incDir>
1.1432 <preprocessorList>
1.1433 <Elem>PNG_NO_MMX_CODE</Elem>
1.1434 @@ -14506,7 +14506,7 @@
1.1435 <pElem>../../jdk/src/share/native/common</pElem>
1.1436 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1437 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1438 - <pElem>../../jdk/makefiles</pElem>
1.1439 + <pElem>../../jdk/make</pElem>
1.1440 </incDir>
1.1441 <preprocessorList>
1.1442 <Elem>PNG_NO_MMX_CODE</Elem>
1.1443 @@ -14537,7 +14537,7 @@
1.1444 <pElem>../../jdk/src/share/native/common</pElem>
1.1445 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1446 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1447 - <pElem>../../jdk/makefiles</pElem>
1.1448 + <pElem>../../jdk/make</pElem>
1.1449 </incDir>
1.1450 <preprocessorList>
1.1451 <Elem>PNG_NO_MMX_CODE</Elem>
1.1452 @@ -14568,7 +14568,7 @@
1.1453 <pElem>../../jdk/src/share/native/common</pElem>
1.1454 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1455 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1456 - <pElem>../../jdk/makefiles</pElem>
1.1457 + <pElem>../../jdk/make</pElem>
1.1458 </incDir>
1.1459 <preprocessorList>
1.1460 <Elem>PNG_NO_MMX_CODE</Elem>
1.1461 @@ -14599,7 +14599,7 @@
1.1462 <pElem>../../jdk/src/share/native/common</pElem>
1.1463 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1464 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1465 - <pElem>../../jdk/makefiles</pElem>
1.1466 + <pElem>../../jdk/make</pElem>
1.1467 </incDir>
1.1468 <preprocessorList>
1.1469 <Elem>PNG_NO_MMX_CODE</Elem>
1.1470 @@ -14630,7 +14630,7 @@
1.1471 <pElem>../../jdk/src/share/native/common</pElem>
1.1472 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1473 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1474 - <pElem>../../jdk/makefiles</pElem>
1.1475 + <pElem>../../jdk/make</pElem>
1.1476 </incDir>
1.1477 <preprocessorList>
1.1478 <Elem>PNG_NO_MMX_CODE</Elem>
1.1479 @@ -14661,7 +14661,7 @@
1.1480 <pElem>../../jdk/src/share/native/common</pElem>
1.1481 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1482 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1483 - <pElem>../../jdk/makefiles</pElem>
1.1484 + <pElem>../../jdk/make</pElem>
1.1485 </incDir>
1.1486 <preprocessorList>
1.1487 <Elem>PNG_NO_MMX_CODE</Elem>
1.1488 @@ -14692,7 +14692,7 @@
1.1489 <pElem>../../jdk/src/share/native/common</pElem>
1.1490 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1491 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1492 - <pElem>../../jdk/makefiles</pElem>
1.1493 + <pElem>../../jdk/make</pElem>
1.1494 </incDir>
1.1495 <preprocessorList>
1.1496 <Elem>PNG_NO_MMX_CODE</Elem>
1.1497 @@ -14723,7 +14723,7 @@
1.1498 <pElem>../../jdk/src/share/native/common</pElem>
1.1499 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1500 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1501 - <pElem>../../jdk/makefiles</pElem>
1.1502 + <pElem>../../jdk/make</pElem>
1.1503 </incDir>
1.1504 <preprocessorList>
1.1505 <Elem>PNG_NO_MMX_CODE</Elem>
1.1506 @@ -14747,7 +14747,7 @@
1.1507 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1508 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1509 <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
1.1510 - <pElem>../../jdk/makefiles</pElem>
1.1511 + <pElem>../../jdk/make</pElem>
1.1512 </incDir>
1.1513 <preprocessorList>
1.1514 <Elem>THIS_FILE="jpegdecoder.c"</Elem>
1.1515 @@ -14775,7 +14775,7 @@
1.1516 <pElem>../../jdk/src/share/native/common</pElem>
1.1517 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1518 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1519 - <pElem>../../jdk/makefiles</pElem>
1.1520 + <pElem>../../jdk/make</pElem>
1.1521 </incDir>
1.1522 <preprocessorList>
1.1523 <Elem>PNG_NO_MMX_CODE</Elem>
1.1524 @@ -14806,7 +14806,7 @@
1.1525 <pElem>../../jdk/src/share/native/common</pElem>
1.1526 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1527 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1528 - <pElem>../../jdk/makefiles</pElem>
1.1529 + <pElem>../../jdk/make</pElem>
1.1530 </incDir>
1.1531 <preprocessorList>
1.1532 <Elem>PNG_NO_MMX_CODE</Elem>
1.1533 @@ -14837,7 +14837,7 @@
1.1534 <pElem>../../jdk/src/share/native/common</pElem>
1.1535 <pElem>../../jdk/src/solaris/native/common</pElem>
1.1536 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.1537 - <pElem>../../jdk/makefiles</pElem>
1.1538 + <pElem>../../jdk/make</pElem>
1.1539 </incDir>
1.1540 <preprocessorList>
1.1541 <Elem>PNG_NO_MMX_CODE</Elem>
1.1542 @@ -15014,7 +15014,7 @@
1.1543 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.1544 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.1545 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.1546 - <pElem>../../jdk/makefiles</pElem>
1.1547 + <pElem>../../jdk/make</pElem>
1.1548 </incDir>
1.1549 <preprocessorList>
1.1550 <Elem>INTERNAL_BUILD</Elem>
1.1551 @@ -15029,7 +15029,7 @@
1.1552 <incDir>
1.1553 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1554 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1555 - <pElem>../../jdk/makefiles</pElem>
1.1556 + <pElem>../../jdk/make</pElem>
1.1557 </incDir>
1.1558 <preprocessorList>
1.1559 <Elem>MLIB_OS64BIT</Elem>
1.1560 @@ -15045,7 +15045,7 @@
1.1561 <incDir>
1.1562 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1563 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1564 - <pElem>../../jdk/makefiles</pElem>
1.1565 + <pElem>../../jdk/make</pElem>
1.1566 </incDir>
1.1567 <preprocessorList>
1.1568 <Elem>MLIB_OS64BIT</Elem>
1.1569 @@ -15061,7 +15061,7 @@
1.1570 <incDir>
1.1571 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1572 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1573 - <pElem>../../jdk/makefiles</pElem>
1.1574 + <pElem>../../jdk/make</pElem>
1.1575 </incDir>
1.1576 <preprocessorList>
1.1577 <Elem>MLIB_OS64BIT</Elem>
1.1578 @@ -15077,7 +15077,7 @@
1.1579 <incDir>
1.1580 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1581 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1582 - <pElem>../../jdk/makefiles</pElem>
1.1583 + <pElem>../../jdk/make</pElem>
1.1584 </incDir>
1.1585 <preprocessorList>
1.1586 <Elem>MLIB_OS64BIT</Elem>
1.1587 @@ -15093,7 +15093,7 @@
1.1588 <incDir>
1.1589 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1590 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1591 - <pElem>../../jdk/makefiles</pElem>
1.1592 + <pElem>../../jdk/make</pElem>
1.1593 </incDir>
1.1594 <preprocessorList>
1.1595 <Elem>MLIB_OS64BIT</Elem>
1.1596 @@ -15109,7 +15109,7 @@
1.1597 <incDir>
1.1598 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1599 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1600 - <pElem>../../jdk/makefiles</pElem>
1.1601 + <pElem>../../jdk/make</pElem>
1.1602 </incDir>
1.1603 <preprocessorList>
1.1604 <Elem>MLIB_OS64BIT</Elem>
1.1605 @@ -15125,7 +15125,7 @@
1.1606 <incDir>
1.1607 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1608 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1609 - <pElem>../../jdk/makefiles</pElem>
1.1610 + <pElem>../../jdk/make</pElem>
1.1611 </incDir>
1.1612 <preprocessorList>
1.1613 <Elem>MLIB_OS64BIT</Elem>
1.1614 @@ -15141,7 +15141,7 @@
1.1615 <incDir>
1.1616 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1617 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1618 - <pElem>../../jdk/makefiles</pElem>
1.1619 + <pElem>../../jdk/make</pElem>
1.1620 </incDir>
1.1621 <preprocessorList>
1.1622 <Elem>MLIB_OS64BIT</Elem>
1.1623 @@ -15157,7 +15157,7 @@
1.1624 <incDir>
1.1625 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1626 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1627 - <pElem>../../jdk/makefiles</pElem>
1.1628 + <pElem>../../jdk/make</pElem>
1.1629 </incDir>
1.1630 <preprocessorList>
1.1631 <Elem>MLIB_OS64BIT</Elem>
1.1632 @@ -15173,7 +15173,7 @@
1.1633 <incDir>
1.1634 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1635 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1636 - <pElem>../../jdk/makefiles</pElem>
1.1637 + <pElem>../../jdk/make</pElem>
1.1638 </incDir>
1.1639 <preprocessorList>
1.1640 <Elem>MLIB_OS64BIT</Elem>
1.1641 @@ -15189,7 +15189,7 @@
1.1642 <incDir>
1.1643 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1644 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1645 - <pElem>../../jdk/makefiles</pElem>
1.1646 + <pElem>../../jdk/make</pElem>
1.1647 </incDir>
1.1648 <preprocessorList>
1.1649 <Elem>MLIB_OS64BIT</Elem>
1.1650 @@ -15205,7 +15205,7 @@
1.1651 <incDir>
1.1652 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1653 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1654 - <pElem>../../jdk/makefiles</pElem>
1.1655 + <pElem>../../jdk/make</pElem>
1.1656 </incDir>
1.1657 <preprocessorList>
1.1658 <Elem>MLIB_OS64BIT</Elem>
1.1659 @@ -15221,7 +15221,7 @@
1.1660 <incDir>
1.1661 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1662 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1663 - <pElem>../../jdk/makefiles</pElem>
1.1664 + <pElem>../../jdk/make</pElem>
1.1665 </incDir>
1.1666 <preprocessorList>
1.1667 <Elem>MLIB_OS64BIT</Elem>
1.1668 @@ -15237,7 +15237,7 @@
1.1669 <incDir>
1.1670 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1671 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1672 - <pElem>../../jdk/makefiles</pElem>
1.1673 + <pElem>../../jdk/make</pElem>
1.1674 </incDir>
1.1675 <preprocessorList>
1.1676 <Elem>MLIB_OS64BIT</Elem>
1.1677 @@ -15253,7 +15253,7 @@
1.1678 <incDir>
1.1679 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1680 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1681 - <pElem>../../jdk/makefiles</pElem>
1.1682 + <pElem>../../jdk/make</pElem>
1.1683 </incDir>
1.1684 <preprocessorList>
1.1685 <Elem>MLIB_OS64BIT</Elem>
1.1686 @@ -15269,7 +15269,7 @@
1.1687 <incDir>
1.1688 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1689 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1690 - <pElem>../../jdk/makefiles</pElem>
1.1691 + <pElem>../../jdk/make</pElem>
1.1692 </incDir>
1.1693 <preprocessorList>
1.1694 <Elem>MLIB_OS64BIT</Elem>
1.1695 @@ -15285,7 +15285,7 @@
1.1696 <incDir>
1.1697 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1698 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1699 - <pElem>../../jdk/makefiles</pElem>
1.1700 + <pElem>../../jdk/make</pElem>
1.1701 </incDir>
1.1702 <preprocessorList>
1.1703 <Elem>MLIB_OS64BIT</Elem>
1.1704 @@ -15301,7 +15301,7 @@
1.1705 <incDir>
1.1706 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1707 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1708 - <pElem>../../jdk/makefiles</pElem>
1.1709 + <pElem>../../jdk/make</pElem>
1.1710 </incDir>
1.1711 <preprocessorList>
1.1712 <Elem>MLIB_OS64BIT</Elem>
1.1713 @@ -15317,7 +15317,7 @@
1.1714 <incDir>
1.1715 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1716 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1717 - <pElem>../../jdk/makefiles</pElem>
1.1718 + <pElem>../../jdk/make</pElem>
1.1719 </incDir>
1.1720 <preprocessorList>
1.1721 <Elem>MLIB_OS64BIT</Elem>
1.1722 @@ -15333,7 +15333,7 @@
1.1723 <incDir>
1.1724 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1725 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1726 - <pElem>../../jdk/makefiles</pElem>
1.1727 + <pElem>../../jdk/make</pElem>
1.1728 </incDir>
1.1729 <preprocessorList>
1.1730 <Elem>MLIB_OS64BIT</Elem>
1.1731 @@ -15349,7 +15349,7 @@
1.1732 <incDir>
1.1733 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1734 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1735 - <pElem>../../jdk/makefiles</pElem>
1.1736 + <pElem>../../jdk/make</pElem>
1.1737 </incDir>
1.1738 <preprocessorList>
1.1739 <Elem>MLIB_OS64BIT</Elem>
1.1740 @@ -15365,7 +15365,7 @@
1.1741 <incDir>
1.1742 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1743 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1744 - <pElem>../../jdk/makefiles</pElem>
1.1745 + <pElem>../../jdk/make</pElem>
1.1746 </incDir>
1.1747 <preprocessorList>
1.1748 <Elem>MLIB_OS64BIT</Elem>
1.1749 @@ -15381,7 +15381,7 @@
1.1750 <incDir>
1.1751 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1752 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1753 - <pElem>../../jdk/makefiles</pElem>
1.1754 + <pElem>../../jdk/make</pElem>
1.1755 </incDir>
1.1756 <preprocessorList>
1.1757 <Elem>MLIB_OS64BIT</Elem>
1.1758 @@ -15397,7 +15397,7 @@
1.1759 <incDir>
1.1760 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1761 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1762 - <pElem>../../jdk/makefiles</pElem>
1.1763 + <pElem>../../jdk/make</pElem>
1.1764 </incDir>
1.1765 <preprocessorList>
1.1766 <Elem>MLIB_OS64BIT</Elem>
1.1767 @@ -15413,7 +15413,7 @@
1.1768 <incDir>
1.1769 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1770 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1771 - <pElem>../../jdk/makefiles</pElem>
1.1772 + <pElem>../../jdk/make</pElem>
1.1773 </incDir>
1.1774 <preprocessorList>
1.1775 <Elem>MLIB_OS64BIT</Elem>
1.1776 @@ -15429,7 +15429,7 @@
1.1777 <incDir>
1.1778 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1779 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1780 - <pElem>../../jdk/makefiles</pElem>
1.1781 + <pElem>../../jdk/make</pElem>
1.1782 </incDir>
1.1783 <preprocessorList>
1.1784 <Elem>MLIB_OS64BIT</Elem>
1.1785 @@ -15445,7 +15445,7 @@
1.1786 <incDir>
1.1787 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1788 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1789 - <pElem>../../jdk/makefiles</pElem>
1.1790 + <pElem>../../jdk/make</pElem>
1.1791 </incDir>
1.1792 <preprocessorList>
1.1793 <Elem>MLIB_OS64BIT</Elem>
1.1794 @@ -15461,7 +15461,7 @@
1.1795 <incDir>
1.1796 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1797 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1798 - <pElem>../../jdk/makefiles</pElem>
1.1799 + <pElem>../../jdk/make</pElem>
1.1800 </incDir>
1.1801 <preprocessorList>
1.1802 <Elem>MLIB_OS64BIT</Elem>
1.1803 @@ -15477,7 +15477,7 @@
1.1804 <incDir>
1.1805 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1806 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1807 - <pElem>../../jdk/makefiles</pElem>
1.1808 + <pElem>../../jdk/make</pElem>
1.1809 </incDir>
1.1810 <preprocessorList>
1.1811 <Elem>MLIB_OS64BIT</Elem>
1.1812 @@ -15493,7 +15493,7 @@
1.1813 <incDir>
1.1814 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1815 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1816 - <pElem>../../jdk/makefiles</pElem>
1.1817 + <pElem>../../jdk/make</pElem>
1.1818 </incDir>
1.1819 <preprocessorList>
1.1820 <Elem>MLIB_OS64BIT</Elem>
1.1821 @@ -15509,7 +15509,7 @@
1.1822 <incDir>
1.1823 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1824 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1825 - <pElem>../../jdk/makefiles</pElem>
1.1826 + <pElem>../../jdk/make</pElem>
1.1827 </incDir>
1.1828 <preprocessorList>
1.1829 <Elem>MLIB_OS64BIT</Elem>
1.1830 @@ -15525,7 +15525,7 @@
1.1831 <incDir>
1.1832 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1833 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1834 - <pElem>../../jdk/makefiles</pElem>
1.1835 + <pElem>../../jdk/make</pElem>
1.1836 </incDir>
1.1837 <preprocessorList>
1.1838 <Elem>MLIB_OS64BIT</Elem>
1.1839 @@ -15541,7 +15541,7 @@
1.1840 <incDir>
1.1841 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1842 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1843 - <pElem>../../jdk/makefiles</pElem>
1.1844 + <pElem>../../jdk/make</pElem>
1.1845 </incDir>
1.1846 <preprocessorList>
1.1847 <Elem>MLIB_OS64BIT</Elem>
1.1848 @@ -15557,7 +15557,7 @@
1.1849 <incDir>
1.1850 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1851 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1852 - <pElem>../../jdk/makefiles</pElem>
1.1853 + <pElem>../../jdk/make</pElem>
1.1854 </incDir>
1.1855 <preprocessorList>
1.1856 <Elem>MLIB_OS64BIT</Elem>
1.1857 @@ -15573,7 +15573,7 @@
1.1858 <incDir>
1.1859 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1860 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1861 - <pElem>../../jdk/makefiles</pElem>
1.1862 + <pElem>../../jdk/make</pElem>
1.1863 </incDir>
1.1864 <preprocessorList>
1.1865 <Elem>MLIB_OS64BIT</Elem>
1.1866 @@ -15589,7 +15589,7 @@
1.1867 <incDir>
1.1868 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1869 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1870 - <pElem>../../jdk/makefiles</pElem>
1.1871 + <pElem>../../jdk/make</pElem>
1.1872 </incDir>
1.1873 <preprocessorList>
1.1874 <Elem>MLIB_OS64BIT</Elem>
1.1875 @@ -15605,7 +15605,7 @@
1.1876 <incDir>
1.1877 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1878 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1879 - <pElem>../../jdk/makefiles</pElem>
1.1880 + <pElem>../../jdk/make</pElem>
1.1881 </incDir>
1.1882 <preprocessorList>
1.1883 <Elem>MLIB_OS64BIT</Elem>
1.1884 @@ -15621,7 +15621,7 @@
1.1885 <incDir>
1.1886 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1887 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1888 - <pElem>../../jdk/makefiles</pElem>
1.1889 + <pElem>../../jdk/make</pElem>
1.1890 </incDir>
1.1891 <preprocessorList>
1.1892 <Elem>MLIB_OS64BIT</Elem>
1.1893 @@ -15637,7 +15637,7 @@
1.1894 <incDir>
1.1895 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1896 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1897 - <pElem>../../jdk/makefiles</pElem>
1.1898 + <pElem>../../jdk/make</pElem>
1.1899 </incDir>
1.1900 <preprocessorList>
1.1901 <Elem>MLIB_OS64BIT</Elem>
1.1902 @@ -15653,7 +15653,7 @@
1.1903 <incDir>
1.1904 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1905 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1906 - <pElem>../../jdk/makefiles</pElem>
1.1907 + <pElem>../../jdk/make</pElem>
1.1908 </incDir>
1.1909 <preprocessorList>
1.1910 <Elem>MLIB_OS64BIT</Elem>
1.1911 @@ -15669,7 +15669,7 @@
1.1912 <incDir>
1.1913 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1914 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1915 - <pElem>../../jdk/makefiles</pElem>
1.1916 + <pElem>../../jdk/make</pElem>
1.1917 </incDir>
1.1918 <preprocessorList>
1.1919 <Elem>MLIB_OS64BIT</Elem>
1.1920 @@ -15685,7 +15685,7 @@
1.1921 <incDir>
1.1922 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1923 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1924 - <pElem>../../jdk/makefiles</pElem>
1.1925 + <pElem>../../jdk/make</pElem>
1.1926 </incDir>
1.1927 <preprocessorList>
1.1928 <Elem>MLIB_OS64BIT</Elem>
1.1929 @@ -15701,7 +15701,7 @@
1.1930 <incDir>
1.1931 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1932 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1933 - <pElem>../../jdk/makefiles</pElem>
1.1934 + <pElem>../../jdk/make</pElem>
1.1935 </incDir>
1.1936 <preprocessorList>
1.1937 <Elem>MLIB_OS64BIT</Elem>
1.1938 @@ -15717,7 +15717,7 @@
1.1939 <incDir>
1.1940 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1941 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1942 - <pElem>../../jdk/makefiles</pElem>
1.1943 + <pElem>../../jdk/make</pElem>
1.1944 </incDir>
1.1945 <preprocessorList>
1.1946 <Elem>MLIB_OS64BIT</Elem>
1.1947 @@ -15733,7 +15733,7 @@
1.1948 <incDir>
1.1949 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1950 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1951 - <pElem>../../jdk/makefiles</pElem>
1.1952 + <pElem>../../jdk/make</pElem>
1.1953 </incDir>
1.1954 <preprocessorList>
1.1955 <Elem>MLIB_OS64BIT</Elem>
1.1956 @@ -15749,7 +15749,7 @@
1.1957 <incDir>
1.1958 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1959 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1960 - <pElem>../../jdk/makefiles</pElem>
1.1961 + <pElem>../../jdk/make</pElem>
1.1962 </incDir>
1.1963 <preprocessorList>
1.1964 <Elem>MLIB_OS64BIT</Elem>
1.1965 @@ -15765,7 +15765,7 @@
1.1966 <incDir>
1.1967 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1968 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1969 - <pElem>../../jdk/makefiles</pElem>
1.1970 + <pElem>../../jdk/make</pElem>
1.1971 </incDir>
1.1972 <preprocessorList>
1.1973 <Elem>MLIB_OS64BIT</Elem>
1.1974 @@ -15781,7 +15781,7 @@
1.1975 <incDir>
1.1976 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1977 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1978 - <pElem>../../jdk/makefiles</pElem>
1.1979 + <pElem>../../jdk/make</pElem>
1.1980 </incDir>
1.1981 <preprocessorList>
1.1982 <Elem>MLIB_OS64BIT</Elem>
1.1983 @@ -15797,7 +15797,7 @@
1.1984 <incDir>
1.1985 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1986 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1987 - <pElem>../../jdk/makefiles</pElem>
1.1988 + <pElem>../../jdk/make</pElem>
1.1989 </incDir>
1.1990 <preprocessorList>
1.1991 <Elem>MLIB_OS64BIT</Elem>
1.1992 @@ -15813,7 +15813,7 @@
1.1993 <incDir>
1.1994 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.1995 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.1996 - <pElem>../../jdk/makefiles</pElem>
1.1997 + <pElem>../../jdk/make</pElem>
1.1998 </incDir>
1.1999 <preprocessorList>
1.2000 <Elem>MLIB_OS64BIT</Elem>
1.2001 @@ -15829,7 +15829,7 @@
1.2002 <incDir>
1.2003 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.2004 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.2005 - <pElem>../../jdk/makefiles</pElem>
1.2006 + <pElem>../../jdk/make</pElem>
1.2007 </incDir>
1.2008 <preprocessorList>
1.2009 <Elem>MLIB_OS64BIT</Elem>
1.2010 @@ -15845,7 +15845,7 @@
1.2011 <incDir>
1.2012 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.2013 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.2014 - <pElem>../../jdk/makefiles</pElem>
1.2015 + <pElem>../../jdk/make</pElem>
1.2016 </incDir>
1.2017 <preprocessorList>
1.2018 <Elem>MLIB_OS64BIT</Elem>
1.2019 @@ -15861,7 +15861,7 @@
1.2020 <incDir>
1.2021 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.2022 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.2023 - <pElem>../../jdk/makefiles</pElem>
1.2024 + <pElem>../../jdk/make</pElem>
1.2025 </incDir>
1.2026 <preprocessorList>
1.2027 <Elem>MLIB_OS64BIT</Elem>
1.2028 @@ -15877,7 +15877,7 @@
1.2029 <incDir>
1.2030 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.2031 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.2032 - <pElem>../../jdk/makefiles</pElem>
1.2033 + <pElem>../../jdk/make</pElem>
1.2034 </incDir>
1.2035 <preprocessorList>
1.2036 <Elem>MLIB_OS64BIT</Elem>
1.2037 @@ -15893,7 +15893,7 @@
1.2038 <incDir>
1.2039 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.2040 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.2041 - <pElem>../../jdk/makefiles</pElem>
1.2042 + <pElem>../../jdk/make</pElem>
1.2043 </incDir>
1.2044 <preprocessorList>
1.2045 <Elem>MLIB_OS64BIT</Elem>
1.2046 @@ -15983,7 +15983,7 @@
1.2047 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2048 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2049 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2050 - <pElem>../../jdk/makefiles</pElem>
1.2051 + <pElem>../../jdk/make</pElem>
1.2052 </incDir>
1.2053 <preprocessorList>
1.2054 <Elem>INTERNAL_BUILD</Elem>
1.2055 @@ -16010,7 +16010,7 @@
1.2056 <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
1.2057 <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
1.2058 <pElem>../../jdk/src/share/native/sun/java2d</pElem>
1.2059 - <pElem>../../jdk/makefiles</pElem>
1.2060 + <pElem>../../jdk/make</pElem>
1.2061 </incDir>
1.2062 <preprocessorList>
1.2063 <Elem>HEADLESS</Elem>
1.2064 @@ -16045,7 +16045,7 @@
1.2065 <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
1.2066 <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
1.2067 <pElem>../../jdk/src/share/native/sun/java2d</pElem>
1.2068 - <pElem>../../jdk/makefiles</pElem>
1.2069 + <pElem>../../jdk/make</pElem>
1.2070 </incDir>
1.2071 <preprocessorList>
1.2072 <Elem>HEADLESS</Elem>
1.2073 @@ -16805,7 +16805,7 @@
1.2074 <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
1.2075 <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
1.2076 <pElem>../../jdk/src/share/native/sun/java2d</pElem>
1.2077 - <pElem>../../jdk/makefiles</pElem>
1.2078 + <pElem>../../jdk/make</pElem>
1.2079 </incDir>
1.2080 <preprocessorList>
1.2081 <Elem>HEADLESS</Elem>
1.2082 @@ -16836,7 +16836,7 @@
1.2083 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.2084 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.2085 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.2086 - <pElem>../../jdk/makefiles</pElem>
1.2087 + <pElem>../../jdk/make</pElem>
1.2088 </incDir>
1.2089 <preprocessorList>
1.2090 <Elem>INTERNAL_BUILD</Elem>
1.2091 @@ -16869,7 +16869,7 @@
1.2092 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.2093 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.2094 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.2095 - <pElem>../../jdk/makefiles</pElem>
1.2096 + <pElem>../../jdk/make</pElem>
1.2097 </incDir>
1.2098 <preprocessorList>
1.2099 <Elem>INTERNAL_BUILD</Elem>
1.2100 @@ -16902,7 +16902,7 @@
1.2101 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.2102 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.2103 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.2104 - <pElem>../../jdk/makefiles</pElem>
1.2105 + <pElem>../../jdk/make</pElem>
1.2106 </incDir>
1.2107 <preprocessorList>
1.2108 <Elem>INTERNAL_BUILD</Elem>
1.2109 @@ -18449,7 +18449,7 @@
1.2110 <pElem>../../jdk/src/share/bin</pElem>
1.2111 <pElem>../../jdk/src/solaris/bin</pElem>
1.2112 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.2113 - <pElem>../../jdk/makefiles</pElem>
1.2114 + <pElem>../../jdk/make</pElem>
1.2115 </incDir>
1.2116 <preprocessorList>
1.2117 <Elem>LIBARCHNAME="amd64"</Elem>
1.2118 @@ -18466,7 +18466,7 @@
1.2119 <pElem>../../jdk/src/share/bin</pElem>
1.2120 <pElem>../../jdk/src/solaris/bin</pElem>
1.2121 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.2122 - <pElem>../../jdk/makefiles</pElem>
1.2123 + <pElem>../../jdk/make</pElem>
1.2124 </incDir>
1.2125 <preprocessorList>
1.2126 <Elem>LIBARCHNAME="amd64"</Elem>
1.2127 @@ -18484,7 +18484,7 @@
1.2128 <pElem>../../jdk/src/share/bin</pElem>
1.2129 <pElem>../../jdk/src/solaris/bin</pElem>
1.2130 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.2131 - <pElem>../../jdk/makefiles</pElem>
1.2132 + <pElem>../../jdk/make</pElem>
1.2133 </incDir>
1.2134 <preprocessorList>
1.2135 <Elem>LIBARCHNAME="amd64"</Elem>
1.2136 @@ -18502,7 +18502,7 @@
1.2137 <pElem>../../jdk/src/share/bin</pElem>
1.2138 <pElem>../../jdk/src/solaris/bin</pElem>
1.2139 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.2140 - <pElem>../../jdk/makefiles</pElem>
1.2141 + <pElem>../../jdk/make</pElem>
1.2142 </incDir>
1.2143 <preprocessorList>
1.2144 <Elem>LIBARCHNAME="amd64"</Elem>
1.2145 @@ -18514,7 +18514,7 @@
1.2146 <cTool>
1.2147 <incDir>
1.2148 <pElem>../../jdk/src/share/bin</pElem>
1.2149 - <pElem>../../jdk/makefiles</pElem>
1.2150 + <pElem>../../jdk/make</pElem>
1.2151 </incDir>
1.2152 <preprocessorList>
1.2153 <Elem>THIS_FILE="jexec.c"</Elem>
1.2154 @@ -18895,7 +18895,7 @@
1.2155 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2156 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2157 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2158 - <pElem>../../jdk/makefiles</pElem>
1.2159 + <pElem>../../jdk/make</pElem>
1.2160 </incDir>
1.2161 <preprocessorList>
1.2162 <Elem>INTERNAL_BUILD</Elem>
1.2163 @@ -18934,7 +18934,7 @@
1.2164 <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
1.2165 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.2166 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.2167 - <pElem>../../jdk/makefiles</pElem>
1.2168 + <pElem>../../jdk/make</pElem>
1.2169 </incDir>
1.2170 <preprocessorList>
1.2171 <Elem>HEADLESS=true</Elem>
1.2172 @@ -18971,7 +18971,7 @@
1.2173 <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
1.2174 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.2175 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.2176 - <pElem>../../jdk/makefiles</pElem>
1.2177 + <pElem>../../jdk/make</pElem>
1.2178 </incDir>
1.2179 <preprocessorList>
1.2180 <Elem>HEADLESS=true</Elem>
1.2181 @@ -19010,7 +19010,7 @@
1.2182 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2183 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2184 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2185 - <pElem>../../jdk/makefiles</pElem>
1.2186 + <pElem>../../jdk/make</pElem>
1.2187 </incDir>
1.2188 <preprocessorList>
1.2189 <Elem>INTERNAL_BUILD</Elem>
1.2190 @@ -19051,7 +19051,7 @@
1.2191 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2192 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2193 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2194 - <pElem>../../jdk/makefiles</pElem>
1.2195 + <pElem>../../jdk/make</pElem>
1.2196 </incDir>
1.2197 <preprocessorList>
1.2198 <Elem>INTERNAL_BUILD</Elem>
1.2199 @@ -19092,7 +19092,7 @@
1.2200 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2201 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2202 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2203 - <pElem>../../jdk/makefiles</pElem>
1.2204 + <pElem>../../jdk/make</pElem>
1.2205 </incDir>
1.2206 <preprocessorList>
1.2207 <Elem>INTERNAL_BUILD</Elem>
1.2208 @@ -19133,7 +19133,7 @@
1.2209 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2210 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2211 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2212 - <pElem>../../jdk/makefiles</pElem>
1.2213 + <pElem>../../jdk/make</pElem>
1.2214 </incDir>
1.2215 <preprocessorList>
1.2216 <Elem>INTERNAL_BUILD</Elem>
1.2217 @@ -19174,7 +19174,7 @@
1.2218 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2219 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2220 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2221 - <pElem>../../jdk/makefiles</pElem>
1.2222 + <pElem>../../jdk/make</pElem>
1.2223 </incDir>
1.2224 <preprocessorList>
1.2225 <Elem>INTERNAL_BUILD</Elem>
1.2226 @@ -19215,7 +19215,7 @@
1.2227 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2228 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2229 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2230 - <pElem>../../jdk/makefiles</pElem>
1.2231 + <pElem>../../jdk/make</pElem>
1.2232 </incDir>
1.2233 <preprocessorList>
1.2234 <Elem>INTERNAL_BUILD</Elem>
1.2235 @@ -19256,7 +19256,7 @@
1.2236 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2237 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2238 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2239 - <pElem>../../jdk/makefiles</pElem>
1.2240 + <pElem>../../jdk/make</pElem>
1.2241 </incDir>
1.2242 <preprocessorList>
1.2243 <Elem>INTERNAL_BUILD</Elem>
1.2244 @@ -19297,7 +19297,7 @@
1.2245 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2246 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2247 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2248 - <pElem>../../jdk/makefiles</pElem>
1.2249 + <pElem>../../jdk/make</pElem>
1.2250 </incDir>
1.2251 <preprocessorList>
1.2252 <Elem>INTERNAL_BUILD</Elem>
1.2253 @@ -19338,7 +19338,7 @@
1.2254 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.2255 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.2256 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.2257 - <pElem>../../jdk/makefiles</pElem>
1.2258 + <pElem>../../jdk/make</pElem>
1.2259 </incDir>
1.2260 <preprocessorList>
1.2261 <Elem>INTERNAL_BUILD</Elem>
1.2262 @@ -19378,7 +19378,7 @@
1.2263 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.2264 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.2265 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.2266 - <pElem>../../jdk/makefiles</pElem>
1.2267 + <pElem>../../jdk/make</pElem>
1.2268 </incDir>
1.2269 <preprocessorList>
1.2270 <Elem>INTERNAL_BUILD</Elem>
1.2271 @@ -19418,7 +19418,7 @@
1.2272 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2273 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2274 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2275 - <pElem>../../jdk/makefiles</pElem>
1.2276 + <pElem>../../jdk/make</pElem>
1.2277 </incDir>
1.2278 <preprocessorList>
1.2279 <Elem>INTERNAL_BUILD</Elem>
1.2280 @@ -19459,7 +19459,7 @@
1.2281 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2282 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2283 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2284 - <pElem>../../jdk/makefiles</pElem>
1.2285 + <pElem>../../jdk/make</pElem>
1.2286 </incDir>
1.2287 <preprocessorList>
1.2288 <Elem>INTERNAL_BUILD</Elem>
1.2289 @@ -19500,7 +19500,7 @@
1.2290 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2291 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2292 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2293 - <pElem>../../jdk/makefiles</pElem>
1.2294 + <pElem>../../jdk/make</pElem>
1.2295 </incDir>
1.2296 <preprocessorList>
1.2297 <Elem>INTERNAL_BUILD</Elem>
1.2298 @@ -19541,7 +19541,7 @@
1.2299 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2300 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2301 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2302 - <pElem>../../jdk/makefiles</pElem>
1.2303 + <pElem>../../jdk/make</pElem>
1.2304 </incDir>
1.2305 <preprocessorList>
1.2306 <Elem>INTERNAL_BUILD</Elem>
1.2307 @@ -19582,7 +19582,7 @@
1.2308 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2309 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2310 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2311 - <pElem>../../jdk/makefiles</pElem>
1.2312 + <pElem>../../jdk/make</pElem>
1.2313 </incDir>
1.2314 <preprocessorList>
1.2315 <Elem>INTERNAL_BUILD</Elem>
1.2316 @@ -19623,7 +19623,7 @@
1.2317 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2318 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2319 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2320 - <pElem>../../jdk/makefiles</pElem>
1.2321 + <pElem>../../jdk/make</pElem>
1.2322 </incDir>
1.2323 <preprocessorList>
1.2324 <Elem>INTERNAL_BUILD</Elem>
1.2325 @@ -19664,7 +19664,7 @@
1.2326 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2327 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2328 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2329 - <pElem>../../jdk/makefiles</pElem>
1.2330 + <pElem>../../jdk/make</pElem>
1.2331 </incDir>
1.2332 <preprocessorList>
1.2333 <Elem>INTERNAL_BUILD</Elem>
1.2334 @@ -19705,7 +19705,7 @@
1.2335 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2336 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2337 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2338 - <pElem>../../jdk/makefiles</pElem>
1.2339 + <pElem>../../jdk/make</pElem>
1.2340 </incDir>
1.2341 <preprocessorList>
1.2342 <Elem>INTERNAL_BUILD</Elem>
1.2343 @@ -19746,7 +19746,7 @@
1.2344 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2345 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2346 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2347 - <pElem>../../jdk/makefiles</pElem>
1.2348 + <pElem>../../jdk/make</pElem>
1.2349 </incDir>
1.2350 <preprocessorList>
1.2351 <Elem>INTERNAL_BUILD</Elem>
1.2352 @@ -19787,7 +19787,7 @@
1.2353 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2354 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2355 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2356 - <pElem>../../jdk/makefiles</pElem>
1.2357 + <pElem>../../jdk/make</pElem>
1.2358 </incDir>
1.2359 <preprocessorList>
1.2360 <Elem>INTERNAL_BUILD</Elem>
1.2361 @@ -19828,7 +19828,7 @@
1.2362 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2363 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2364 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2365 - <pElem>../../jdk/makefiles</pElem>
1.2366 + <pElem>../../jdk/make</pElem>
1.2367 </incDir>
1.2368 <preprocessorList>
1.2369 <Elem>INTERNAL_BUILD</Elem>
1.2370 @@ -19869,7 +19869,7 @@
1.2371 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2372 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2373 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2374 - <pElem>../../jdk/makefiles</pElem>
1.2375 + <pElem>../../jdk/make</pElem>
1.2376 </incDir>
1.2377 <preprocessorList>
1.2378 <Elem>INTERNAL_BUILD</Elem>
1.2379 @@ -19915,7 +19915,7 @@
1.2380 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2381 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2382 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2383 - <pElem>../../jdk/makefiles</pElem>
1.2384 + <pElem>../../jdk/make</pElem>
1.2385 </incDir>
1.2386 <preprocessorList>
1.2387 <Elem>INTERNAL_BUILD</Elem>
1.2388 @@ -19956,7 +19956,7 @@
1.2389 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2390 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2391 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2392 - <pElem>../../jdk/makefiles</pElem>
1.2393 + <pElem>../../jdk/make</pElem>
1.2394 </incDir>
1.2395 <preprocessorList>
1.2396 <Elem>INTERNAL_BUILD</Elem>
1.2397 @@ -19997,7 +19997,7 @@
1.2398 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2399 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2400 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2401 - <pElem>../../jdk/makefiles</pElem>
1.2402 + <pElem>../../jdk/make</pElem>
1.2403 </incDir>
1.2404 <preprocessorList>
1.2405 <Elem>INTERNAL_BUILD</Elem>
1.2406 @@ -20133,7 +20133,7 @@
1.2407 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2408 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2409 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2410 - <pElem>../../jdk/makefiles</pElem>
1.2411 + <pElem>../../jdk/make</pElem>
1.2412 </incDir>
1.2413 <preprocessorList>
1.2414 <Elem>THIS_FILE="DatagramChannelImpl.c"</Elem>
1.2415 @@ -20149,7 +20149,7 @@
1.2416 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2417 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2418 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2419 - <pElem>../../jdk/makefiles</pElem>
1.2420 + <pElem>../../jdk/make</pElem>
1.2421 </incDir>
1.2422 <preprocessorList>
1.2423 <Elem>THIS_FILE="DatagramDispatcher.c"</Elem>
1.2424 @@ -20165,7 +20165,7 @@
1.2425 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2426 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2427 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2428 - <pElem>../../jdk/makefiles</pElem>
1.2429 + <pElem>../../jdk/make</pElem>
1.2430 </incDir>
1.2431 <preprocessorList>
1.2432 <Elem>THIS_FILE="EPoll.c"</Elem>
1.2433 @@ -20181,7 +20181,7 @@
1.2434 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2435 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2436 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2437 - <pElem>../../jdk/makefiles</pElem>
1.2438 + <pElem>../../jdk/make</pElem>
1.2439 </incDir>
1.2440 <preprocessorList>
1.2441 <Elem>THIS_FILE="EPollArrayWrapper.c"</Elem>
1.2442 @@ -20197,7 +20197,7 @@
1.2443 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2444 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2445 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2446 - <pElem>../../jdk/makefiles</pElem>
1.2447 + <pElem>../../jdk/make</pElem>
1.2448 </incDir>
1.2449 <preprocessorList>
1.2450 <Elem>THIS_FILE="EPollPort.c"</Elem>
1.2451 @@ -20213,7 +20213,7 @@
1.2452 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2453 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2454 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2455 - <pElem>../../jdk/makefiles</pElem>
1.2456 + <pElem>../../jdk/make</pElem>
1.2457 </incDir>
1.2458 <preprocessorList>
1.2459 <Elem>THIS_FILE="FileChannelImpl.c"</Elem>
1.2460 @@ -20229,7 +20229,7 @@
1.2461 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2462 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2463 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2464 - <pElem>../../jdk/makefiles</pElem>
1.2465 + <pElem>../../jdk/make</pElem>
1.2466 </incDir>
1.2467 <preprocessorList>
1.2468 <Elem>THIS_FILE="FileDispatcherImpl.c"</Elem>
1.2469 @@ -20245,7 +20245,7 @@
1.2470 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2471 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2472 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2473 - <pElem>../../jdk/makefiles</pElem>
1.2474 + <pElem>../../jdk/make</pElem>
1.2475 </incDir>
1.2476 <preprocessorList>
1.2477 <Elem>THIS_FILE="FileKey.c"</Elem>
1.2478 @@ -20261,7 +20261,7 @@
1.2479 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2480 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2481 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2482 - <pElem>../../jdk/makefiles</pElem>
1.2483 + <pElem>../../jdk/make</pElem>
1.2484 </incDir>
1.2485 <preprocessorList>
1.2486 <Elem>THIS_FILE="IOUtil.c"</Elem>
1.2487 @@ -20277,7 +20277,7 @@
1.2488 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2489 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2490 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2491 - <pElem>../../jdk/makefiles</pElem>
1.2492 + <pElem>../../jdk/make</pElem>
1.2493 </incDir>
1.2494 <preprocessorList>
1.2495 <Elem>THIS_FILE="InheritedChannel.c"</Elem>
1.2496 @@ -20293,7 +20293,7 @@
1.2497 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2498 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2499 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2500 - <pElem>../../jdk/makefiles</pElem>
1.2501 + <pElem>../../jdk/make</pElem>
1.2502 </incDir>
1.2503 <preprocessorList>
1.2504 <Elem>THIS_FILE="NativeThread.c"</Elem>
1.2505 @@ -20309,7 +20309,7 @@
1.2506 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2507 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2508 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2509 - <pElem>../../jdk/makefiles</pElem>
1.2510 + <pElem>../../jdk/make</pElem>
1.2511 </incDir>
1.2512 <preprocessorList>
1.2513 <Elem>THIS_FILE="Net.c"</Elem>
1.2514 @@ -20325,7 +20325,7 @@
1.2515 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2516 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2517 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2518 - <pElem>../../jdk/makefiles</pElem>
1.2519 + <pElem>../../jdk/make</pElem>
1.2520 </incDir>
1.2521 <preprocessorList>
1.2522 <Elem>THIS_FILE="PollArrayWrapper.c"</Elem>
1.2523 @@ -20341,7 +20341,7 @@
1.2524 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2525 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2526 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2527 - <pElem>../../jdk/makefiles</pElem>
1.2528 + <pElem>../../jdk/make</pElem>
1.2529 </incDir>
1.2530 <preprocessorList>
1.2531 <Elem>THIS_FILE="ServerSocketChannelImpl.c"</Elem>
1.2532 @@ -20357,7 +20357,7 @@
1.2533 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2534 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2535 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2536 - <pElem>../../jdk/makefiles</pElem>
1.2537 + <pElem>../../jdk/make</pElem>
1.2538 </incDir>
1.2539 <preprocessorList>
1.2540 <Elem>THIS_FILE="SocketChannelImpl.c"</Elem>
1.2541 @@ -20373,7 +20373,7 @@
1.2542 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2543 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2544 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2545 - <pElem>../../jdk/makefiles</pElem>
1.2546 + <pElem>../../jdk/make</pElem>
1.2547 </incDir>
1.2548 <preprocessorList>
1.2549 <Elem>THIS_FILE="SocketDispatcher.c"</Elem>
1.2550 @@ -20389,7 +20389,7 @@
1.2551 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2552 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2553 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2554 - <pElem>../../jdk/makefiles</pElem>
1.2555 + <pElem>../../jdk/make</pElem>
1.2556 </incDir>
1.2557 <preprocessorList>
1.2558 <Elem>THIS_FILE="UnixAsynchronousServerSocketChannelImpl.c"</Elem>
1.2559 @@ -20405,7 +20405,7 @@
1.2560 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2561 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2562 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2563 - <pElem>../../jdk/makefiles</pElem>
1.2564 + <pElem>../../jdk/make</pElem>
1.2565 </incDir>
1.2566 <preprocessorList>
1.2567 <Elem>THIS_FILE="UnixAsynchronousSocketChannelImpl.c"</Elem>
1.2568 @@ -20454,7 +20454,7 @@
1.2569 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2570 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2571 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2572 - <pElem>../../jdk/makefiles</pElem>
1.2573 + <pElem>../../jdk/make</pElem>
1.2574 </incDir>
1.2575 </cTool>
1.2576 </item>
1.2577 @@ -20475,7 +20475,7 @@
1.2578 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2579 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2580 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2581 - <pElem>../../jdk/makefiles</pElem>
1.2582 + <pElem>../../jdk/make</pElem>
1.2583 </incDir>
1.2584 <preprocessorList>
1.2585 <Elem>THIS_FILE="LinuxNativeDispatcher.c"</Elem>
1.2586 @@ -20499,7 +20499,7 @@
1.2587 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2588 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2589 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2590 - <pElem>../../jdk/makefiles</pElem>
1.2591 + <pElem>../../jdk/make</pElem>
1.2592 </incDir>
1.2593 <preprocessorList>
1.2594 <Elem>THIS_FILE="LinuxWatchService.c"</Elem>
1.2595 @@ -20523,7 +20523,7 @@
1.2596 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2597 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2598 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2599 - <pElem>../../jdk/makefiles</pElem>
1.2600 + <pElem>../../jdk/make</pElem>
1.2601 </incDir>
1.2602 <preprocessorList>
1.2603 <Elem>THIS_FILE="MagicFileTypeDetector.c"</Elem>
1.2604 @@ -20547,7 +20547,7 @@
1.2605 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2606 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2607 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2608 - <pElem>../../jdk/makefiles</pElem>
1.2609 + <pElem>../../jdk/make</pElem>
1.2610 </incDir>
1.2611 <preprocessorList>
1.2612 <Elem>THIS_FILE="UnixCopyFile.c"</Elem>
1.2613 @@ -20571,7 +20571,7 @@
1.2614 <pElem>../../jdk/src/share/native/java/io</pElem>
1.2615 <pElem>../../jdk/src/share/native/java/net</pElem>
1.2616 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.2617 - <pElem>../../jdk/makefiles</pElem>
1.2618 + <pElem>../../jdk/make</pElem>
1.2619 </incDir>
1.2620 <preprocessorList>
1.2621 <Elem>THIS_FILE="UnixNativeDispatcher.c"</Elem>
1.2622 @@ -20584,7 +20584,7 @@
1.2623 flavor2="0">
1.2624 <cTool>
1.2625 <incDir>
1.2626 - <pElem>../../jdk/makefiles</pElem>
1.2627 + <pElem>../../jdk/make</pElem>
1.2628 </incDir>
1.2629 <preprocessorList>
1.2630 <Elem>THIS_FILE="genUnixConstants.c"</Elem>
1.2631 @@ -21464,7 +21464,7 @@
1.2632 <pElem>../../jdk/src/share/back</pElem>
1.2633 <pElem>../../jdk/src/solaris/back</pElem>
1.2634 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
1.2635 - <pElem>../../jdk/makefiles</pElem>
1.2636 + <pElem>../../jdk/make</pElem>
1.2637 </incDir>
1.2638 <preprocessorList>
1.2639 <Elem>ARCH="amd64"</Elem>
1.2640 @@ -21541,7 +21541,7 @@
1.2641 <pElem>../../jdk/src/solaris/native/common</pElem>
1.2642 <pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
1.2643 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.2644 - <pElem>../../jdk/makefiles</pElem>
1.2645 + <pElem>../../jdk/make</pElem>
1.2646 </incDir>
1.2647 </ccTool>
1.2648 </folder>
1.2649 @@ -21551,7 +21551,7 @@
1.2650 <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
1.2651 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.2652 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.2653 - <pElem>../../jdk/makefiles</pElem>
1.2654 + <pElem>../../jdk/make</pElem>
1.2655 </incDir>
1.2656 </cTool>
1.2657 </folder>
1.2658 @@ -21560,7 +21560,7 @@
1.2659 <incDir>
1.2660 <pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
1.2661 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.2662 - <pElem>../../jdk/makefiles</pElem>
1.2663 + <pElem>../../jdk/make</pElem>
1.2664 </incDir>
1.2665 <preprocessorList>
1.2666 <Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
1.2667 @@ -21572,7 +21572,7 @@
1.2668 <incDir>
1.2669 <pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
1.2670 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.2671 - <pElem>../../jdk/makefiles</pElem>
1.2672 + <pElem>../../jdk/make</pElem>
1.2673 </incDir>
1.2674 <preprocessorList>
1.2675 <Elem>THIS_FILE="gctest.c"</Elem>
1.2676 @@ -21585,7 +21585,7 @@
1.2677 <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
1.2678 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.2679 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.2680 - <pElem>../../jdk/makefiles</pElem>
1.2681 + <pElem>../../jdk/make</pElem>
1.2682 </incDir>
1.2683 <preprocessorList>
1.2684 <Elem>THIS_FILE="heapTracker.c"</Elem>
1.2685 @@ -21597,7 +21597,7 @@
1.2686 <incDir>
1.2687 <pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
1.2688 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.2689 - <pElem>../../jdk/makefiles</pElem>
1.2690 + <pElem>../../jdk/make</pElem>
1.2691 </incDir>
1.2692 <preprocessorList>
1.2693 <Elem>THIS_FILE="heapViewer.c"</Elem>
1.2694 @@ -21612,7 +21612,7 @@
1.2695 <pElem>../../jdk/src/share/npt</pElem>
1.2696 <pElem>../../jdk/src/solaris/npt</pElem>
1.2697 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.2698 - <pElem>../../jdk/makefiles</pElem>
1.2699 + <pElem>../../jdk/make</pElem>
1.2700 </incDir>
1.2701 <preprocessorList>
1.2702 <Elem>THIS_FILE="debug_malloc.c"</Elem>
1.2703 @@ -21627,7 +21627,7 @@
1.2704 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.2705 <pElem>../../jdk/src/share/npt</pElem>
1.2706 <pElem>../../jdk/src/solaris/npt</pElem>
1.2707 - <pElem>../../jdk/makefiles</pElem>
1.2708 + <pElem>../../jdk/make</pElem>
1.2709 </incDir>
1.2710 <preprocessorList>
1.2711 <Elem>THIS_FILE="java_crw_demo.c"</Elem>
1.2712 @@ -21640,7 +21640,7 @@
1.2713 <pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
1.2714 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.2715 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.2716 - <pElem>../../jdk/makefiles</pElem>
1.2717 + <pElem>../../jdk/make</pElem>
1.2718 </incDir>
1.2719 <preprocessorList>
1.2720 <Elem>THIS_FILE="minst.c"</Elem>
1.2721 @@ -21653,7 +21653,7 @@
1.2722 <pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
1.2723 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.2724 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.2725 - <pElem>../../jdk/makefiles</pElem>
1.2726 + <pElem>../../jdk/make</pElem>
1.2727 </incDir>
1.2728 <preprocessorList>
1.2729 <Elem>THIS_FILE="mtrace.c"</Elem>
1.2730 @@ -21665,7 +21665,7 @@
1.2731 <incDir>
1.2732 <pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
1.2733 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.2734 - <pElem>../../jdk/makefiles</pElem>
1.2735 + <pElem>../../jdk/make</pElem>
1.2736 </incDir>
1.2737 <preprocessorList>
1.2738 <Elem>THIS_FILE="versionCheck.c"</Elem>
1.2739 @@ -21685,7 +21685,7 @@
1.2740 <pElem>../../jdk/src/share/instrument</pElem>
1.2741 <pElem>../../jdk/src/solaris/instrument</pElem>
1.2742 <pElem>../../jdk/src/share/bin</pElem>
1.2743 - <pElem>../../jdk/makefiles</pElem>
1.2744 + <pElem>../../jdk/make</pElem>
1.2745 </incDir>
1.2746 <preprocessorList>
1.2747 <Elem>ARCH="amd64"</Elem>
1.2748 @@ -21727,7 +21727,7 @@
1.2749 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.2750 <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
1.2751 <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
1.2752 - <pElem>../../jdk/makefiles</pElem>
1.2753 + <pElem>../../jdk/make</pElem>
1.2754 </incDir>
1.2755 <preprocessorList>
1.2756 <Elem>ARCH="amd64"</Elem>
1.2757 @@ -21820,7 +21820,7 @@
1.2758 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.2759 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.2760 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.2761 - <pElem>../../jdk/makefiles</pElem>
1.2762 + <pElem>../../jdk/make</pElem>
1.2763 </incDir>
1.2764 <preprocessorList>
1.2765 <Elem>ARCHPROPNAME="amd64"</Elem>
1.2766 @@ -21851,7 +21851,7 @@
1.2767 <cTool>
1.2768 <incDir>
1.2769 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.2770 - <pElem>../../jdk/makefiles</pElem>
1.2771 + <pElem>../../jdk/make</pElem>
1.2772 </incDir>
1.2773 </cTool>
1.2774 </folder>
1.2775 @@ -21873,7 +21873,7 @@
1.2776 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.2777 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.2778 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.2779 - <pElem>../../jdk/makefiles</pElem>
1.2780 + <pElem>../../jdk/make</pElem>
1.2781 </incDir>
1.2782 <preprocessorList>
1.2783 <Elem>ARCHPROPNAME="amd64"</Elem>
1.2784 @@ -21903,7 +21903,7 @@
1.2785 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.2786 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.2787 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.2788 - <pElem>../../jdk/makefiles</pElem>
1.2789 + <pElem>../../jdk/make</pElem>
1.2790 </incDir>
1.2791 <preprocessorList>
1.2792 <Elem>ARCHPROPNAME="amd64"</Elem>
1.2793 @@ -21930,7 +21930,7 @@
1.2794 <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
1.2795 <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
1.2796 <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
1.2797 - <pElem>../../jdk/makefiles</pElem>
1.2798 + <pElem>../../jdk/make</pElem>
1.2799 </incDir>
1.2800 <preprocessorList>
1.2801 <Elem>THIS_FILE="DatagramPacket.c"</Elem>
1.2802 @@ -21962,7 +21962,7 @@
1.2803 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.2804 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.2805 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.2806 - <pElem>../../jdk/makefiles</pElem>
1.2807 + <pElem>../../jdk/make</pElem>
1.2808 </incDir>
1.2809 <preprocessorList>
1.2810 <Elem>ARCHPROPNAME="amd64"</Elem>
1.2811 @@ -21999,7 +21999,7 @@
1.2812 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.2813 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.2814 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.2815 - <pElem>../../jdk/makefiles</pElem>
1.2816 + <pElem>../../jdk/make</pElem>
1.2817 </incDir>
1.2818 <preprocessorList>
1.2819 <Elem>ARCHPROPNAME="amd64"</Elem>
1.2820 @@ -22043,7 +22043,7 @@
1.2821 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.2822 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.2823 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.2824 - <pElem>../../jdk/makefiles</pElem>
1.2825 + <pElem>../../jdk/make</pElem>
1.2826 </incDir>
1.2827 <preprocessorList>
1.2828 <Elem>ARCHPROPNAME="amd64"</Elem>
1.2829 @@ -22079,7 +22079,7 @@
1.2830 <pElem>../../jdk/src/share/native/common</pElem>
1.2831 <pElem>../../jdk/src/solaris/native/common</pElem>
1.2832 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.2833 - <pElem>../../jdk/makefiles</pElem>
1.2834 + <pElem>../../jdk/make</pElem>
1.2835 </incDir>
1.2836 <preprocessorList>
1.2837 <Elem>PNG_NO_MMX_CODE</Elem>
1.2838 @@ -22151,7 +22151,7 @@
1.2839 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2840 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2841 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2842 - <pElem>../../jdk/makefiles</pElem>
1.2843 + <pElem>../../jdk/make</pElem>
1.2844 </incDir>
1.2845 <preprocessorList>
1.2846 <Elem>INTERNAL_BUILD</Elem>
1.2847 @@ -22180,7 +22180,7 @@
1.2848 <pElem>../../jdk/src/share/native/common</pElem>
1.2849 <pElem>../../jdk/src/solaris/native/common</pElem>
1.2850 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.2851 - <pElem>../../jdk/makefiles</pElem>
1.2852 + <pElem>../../jdk/make</pElem>
1.2853 </incDir>
1.2854 <preprocessorList>
1.2855 <Elem>PNG_NO_MMX_CODE</Elem>
1.2856 @@ -22223,7 +22223,7 @@
1.2857 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.2858 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.2859 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.2860 - <pElem>../../jdk/makefiles</pElem>
1.2861 + <pElem>../../jdk/make</pElem>
1.2862 </incDir>
1.2863 <preprocessorList>
1.2864 <Elem>INTERNAL_BUILD</Elem>
1.2865 @@ -22259,7 +22259,7 @@
1.2866 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.2867 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.2868 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.2869 - <pElem>../../jdk/makefiles</pElem>
1.2870 + <pElem>../../jdk/make</pElem>
1.2871 </incDir>
1.2872 <preprocessorList>
1.2873 <Elem>INTERNAL_BUILD</Elem>
1.2874 @@ -22295,7 +22295,7 @@
1.2875 <pElem>../../jdk/src/share/native/common</pElem>
1.2876 <pElem>../../jdk/src/solaris/native/common</pElem>
1.2877 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.2878 - <pElem>../../jdk/makefiles</pElem>
1.2879 + <pElem>../../jdk/make</pElem>
1.2880 </incDir>
1.2881 <preprocessorList>
1.2882 <Elem>PNG_NO_MMX_CODE</Elem>
1.2883 @@ -22342,7 +22342,7 @@
1.2884 <pElem>../../jdk/src/share/native/common</pElem>
1.2885 <pElem>../../jdk/src/solaris/native/common</pElem>
1.2886 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.2887 - <pElem>../../jdk/makefiles</pElem>
1.2888 + <pElem>../../jdk/make</pElem>
1.2889 </incDir>
1.2890 <preprocessorList>
1.2891 <Elem>PNG_NO_MMX_CODE</Elem>
1.2892 @@ -22378,7 +22378,7 @@
1.2893 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2894 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2895 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2896 - <pElem>../../jdk/makefiles</pElem>
1.2897 + <pElem>../../jdk/make</pElem>
1.2898 </incDir>
1.2899 <preprocessorList>
1.2900 <Elem>INTERNAL_BUILD</Elem>
1.2901 @@ -22427,7 +22427,7 @@
1.2902 <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
1.2903 <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
1.2904 <pElem>../../jdk/src/share/native/sun/java2d</pElem>
1.2905 - <pElem>../../jdk/makefiles</pElem>
1.2906 + <pElem>../../jdk/make</pElem>
1.2907 </incDir>
1.2908 <preprocessorList>
1.2909 <Elem>HEADLESS</Elem>
1.2910 @@ -22466,7 +22466,7 @@
1.2911 <incDir>
1.2912 <pElem>../../jdk/src/share/native/sun/java2d</pElem>
1.2913 <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
1.2914 - <pElem>../../jdk/makefiles</pElem>
1.2915 + <pElem>../../jdk/make</pElem>
1.2916 </incDir>
1.2917 </cTool>
1.2918 </folder>
1.2919 @@ -22489,7 +22489,7 @@
1.2920 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.2921 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.2922 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.2923 - <pElem>../../jdk/makefiles</pElem>
1.2924 + <pElem>../../jdk/make</pElem>
1.2925 </incDir>
1.2926 <preprocessorList>
1.2927 <Elem>INTERNAL_BUILD</Elem>
1.2928 @@ -22519,7 +22519,7 @@
1.2929 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.2930 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.2931 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.2932 - <pElem>../../jdk/makefiles</pElem>
1.2933 + <pElem>../../jdk/make</pElem>
1.2934 </incDir>
1.2935 <preprocessorList>
1.2936 <Elem>INTERNAL_BUILD</Elem>
1.2937 @@ -22550,7 +22550,7 @@
1.2938 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.2939 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.2940 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.2941 - <pElem>../../jdk/makefiles</pElem>
1.2942 + <pElem>../../jdk/make</pElem>
1.2943 </incDir>
1.2944 <preprocessorList>
1.2945 <Elem>INTERNAL_BUILD</Elem>
1.2946 @@ -22572,7 +22572,7 @@
1.2947 <pElem>../../jdk/src/solaris/native/common</pElem>
1.2948 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.2949 <pElem>../../jdk/src/share/native/sun/management</pElem>
1.2950 - <pElem>../../jdk/makefiles</pElem>
1.2951 + <pElem>../../jdk/make</pElem>
1.2952 </incDir>
1.2953 <preprocessorList>
1.2954 <Elem>ARCH="amd64"</Elem>
1.2955 @@ -22614,7 +22614,7 @@
1.2956 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.2957 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.2958 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.2959 - <pElem>../../jdk/makefiles</pElem>
1.2960 + <pElem>../../jdk/make</pElem>
1.2961 </incDir>
1.2962 <preprocessorList>
1.2963 <Elem>ARCH="amd64"</Elem>
1.2964 @@ -22639,7 +22639,7 @@
1.2965 <folder path="$SRC/jdk/src/share/native/sun/nio">
1.2966 <cTool>
1.2967 <incDir>
1.2968 - <pElem>../../jdk/makefiles</pElem>
1.2969 + <pElem>../../jdk/make</pElem>
1.2970 </incDir>
1.2971 <preprocessorList>
1.2972 <Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
1.2973 @@ -22671,7 +22671,7 @@
1.2974 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.2975 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.2976 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.2977 - <pElem>../../jdk/makefiles</pElem>
1.2978 + <pElem>../../jdk/make</pElem>
1.2979 </incDir>
1.2980 <preprocessorList>
1.2981 <Elem>ARCH="amd64"</Elem>
1.2982 @@ -22722,7 +22722,7 @@
1.2983 <incDir>
1.2984 <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
1.2985 <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
1.2986 - <pElem>../../jdk/makefiles</pElem>
1.2987 + <pElem>../../jdk/make</pElem>
1.2988 </incDir>
1.2989 <preprocessorList>
1.2990 <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
1.2991 @@ -22734,7 +22734,7 @@
1.2992 <incDir>
1.2993 <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
1.2994 <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
1.2995 - <pElem>../../jdk/makefiles</pElem>
1.2996 + <pElem>../../jdk/make</pElem>
1.2997 </incDir>
1.2998 <preprocessorList>
1.2999 <Elem>MP_API_COMPATIBLE</Elem>
1.3000 @@ -22747,7 +22747,7 @@
1.3001 <incDir>
1.3002 <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
1.3003 <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
1.3004 - <pElem>../../jdk/makefiles</pElem>
1.3005 + <pElem>../../jdk/make</pElem>
1.3006 </incDir>
1.3007 <preprocessorList>
1.3008 <Elem>THIS_FILE="GSSLibStub.c"</Elem>
1.3009 @@ -22761,7 +22761,7 @@
1.3010 <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
1.3011 <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
1.3012 <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
1.3013 - <pElem>../../jdk/makefiles</pElem>
1.3014 + <pElem>../../jdk/make</pElem>
1.3015 </incDir>
1.3016 <preprocessorList>
1.3017 <Elem>THIS_FILE="p11_convert.c"</Elem>
1.3018 @@ -22774,7 +22774,7 @@
1.3019 <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
1.3020 <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
1.3021 <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
1.3022 - <pElem>../../jdk/makefiles</pElem>
1.3023 + <pElem>../../jdk/make</pElem>
1.3024 </incDir>
1.3025 <preprocessorList>
1.3026 <Elem>THIS_FILE="pcsc.c"</Elem>
1.3027 @@ -22793,7 +22793,7 @@
1.3028 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3029 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3030 <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
1.3031 - <pElem>../../jdk/makefiles</pElem>
1.3032 + <pElem>../../jdk/make</pElem>
1.3033 </incDir>
1.3034 <preprocessorList>
1.3035 <Elem>ARCH="amd64"</Elem>
1.3036 @@ -22822,7 +22822,7 @@
1.3037 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3038 <pElem>../../jdk/src/share/npt</pElem>
1.3039 <pElem>../../jdk/src/solaris/npt</pElem>
1.3040 - <pElem>../../jdk/makefiles</pElem>
1.3041 + <pElem>../../jdk/make</pElem>
1.3042 </incDir>
1.3043 <preprocessorList>
1.3044 <Elem>ARCH="amd64"</Elem>
1.3045 @@ -22853,7 +22853,7 @@
1.3046 <pElem>../../jdk/src/solaris/transport/socket</pElem>
1.3047 <pElem>../../jdk/src/share/back/export</pElem>
1.3048 <pElem>../../jdk/src/share/back</pElem>
1.3049 - <pElem>../../jdk/makefiles</pElem>
1.3050 + <pElem>../../jdk/make</pElem>
1.3051 </incDir>
1.3052 <preprocessorList>
1.3053 <Elem>ARCH="amd64"</Elem>
1.3054 @@ -22905,7 +22905,7 @@
1.3055 <pElem>../../jdk/src/share/back</pElem>
1.3056 <pElem>../../jdk/src/solaris/back</pElem>
1.3057 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
1.3058 - <pElem>../../jdk/makefiles</pElem>
1.3059 + <pElem>../../jdk/make</pElem>
1.3060 </incDir>
1.3061 <preprocessorList>
1.3062 <Elem>JDWP_LOGGING</Elem>
1.3063 @@ -22941,7 +22941,7 @@
1.3064 <pElem>../../jdk/src/share/npt</pElem>
1.3065 <pElem>../../jdk/src/solaris/npt</pElem>
1.3066 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.3067 - <pElem>../../jdk/makefiles</pElem>
1.3068 + <pElem>../../jdk/make</pElem>
1.3069 </incDir>
1.3070 <preprocessorList>
1.3071 <Elem>THIS_FILE="hprof_md.c"</Elem>
1.3072 @@ -22961,7 +22961,7 @@
1.3073 <pElem>../../jdk/src/share/instrument</pElem>
1.3074 <pElem>../../jdk/src/solaris/instrument</pElem>
1.3075 <pElem>../../jdk/src/share/bin</pElem>
1.3076 - <pElem>../../jdk/makefiles</pElem>
1.3077 + <pElem>../../jdk/make</pElem>
1.3078 </incDir>
1.3079 <preprocessorList>
1.3080 <Elem>NO_JPLIS_LOGGING</Elem>
1.3081 @@ -22993,7 +22993,7 @@
1.3082 <cTool>
1.3083 <incDir>
1.3084 <pElem>../../jdk/src/share/native/sun/management</pElem>
1.3085 - <pElem>../../jdk/makefiles</pElem>
1.3086 + <pElem>../../jdk/make</pElem>
1.3087 </incDir>
1.3088 </cTool>
1.3089 </folder>
1.3090 @@ -23002,7 +23002,7 @@
1.3091 <incDir>
1.3092 <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
1.3093 <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
1.3094 - <pElem>../../jdk/makefiles</pElem>
1.3095 + <pElem>../../jdk/make</pElem>
1.3096 </incDir>
1.3097 <preprocessorList>
1.3098 <Elem>EXTRA_SOUND_JNI_LIBS=" jsoundalsa"</Elem>
1.3099 @@ -23019,7 +23019,7 @@
1.3100 <folder path="$SRC/jdk/src/solaris/native/com/sun/security">
1.3101 <cTool>
1.3102 <incDir>
1.3103 - <pElem>../../jdk/makefiles</pElem>
1.3104 + <pElem>../../jdk/make</pElem>
1.3105 </incDir>
1.3106 <preprocessorList>
1.3107 <Elem>THIS_FILE="Unix.c"</Elem>
1.3108 @@ -23051,7 +23051,7 @@
1.3109 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3110 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3111 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3112 - <pElem>../../jdk/makefiles</pElem>
1.3113 + <pElem>../../jdk/make</pElem>
1.3114 </incDir>
1.3115 <preprocessorList>
1.3116 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3117 @@ -23097,7 +23097,7 @@
1.3118 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3119 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3120 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3121 - <pElem>../../jdk/makefiles</pElem>
1.3122 + <pElem>../../jdk/make</pElem>
1.3123 </incDir>
1.3124 <preprocessorList>
1.3125 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3126 @@ -23126,7 +23126,7 @@
1.3127 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3128 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3129 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3130 - <pElem>../../jdk/makefiles</pElem>
1.3131 + <pElem>../../jdk/make</pElem>
1.3132 </incDir>
1.3133 <preprocessorList>
1.3134 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3135 @@ -23146,7 +23146,7 @@
1.3136 <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
1.3137 <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
1.3138 <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
1.3139 - <pElem>../../jdk/makefiles</pElem>
1.3140 + <pElem>../../jdk/make</pElem>
1.3141 </incDir>
1.3142 <preprocessorList>
1.3143 <Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
1.3144 @@ -23160,7 +23160,7 @@
1.3145 <pElem>../../jdk/src/share/native/java/io</pElem>
1.3146 <pElem>../../jdk/src/share/native/java/net</pElem>
1.3147 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.3148 - <pElem>../../jdk/makefiles</pElem>
1.3149 + <pElem>../../jdk/make</pElem>
1.3150 </incDir>
1.3151 <preprocessorList>
1.3152 <Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
1.3153 @@ -23185,7 +23185,7 @@
1.3154 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3155 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3156 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3157 - <pElem>../../jdk/makefiles</pElem>
1.3158 + <pElem>../../jdk/make</pElem>
1.3159 </incDir>
1.3160 <preprocessorList>
1.3161 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3162 @@ -23222,7 +23222,7 @@
1.3163 <pElem>../../jdk/src/share/native/common</pElem>
1.3164 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3165 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3166 - <pElem>../../jdk/makefiles</pElem>
1.3167 + <pElem>../../jdk/make</pElem>
1.3168 </incDir>
1.3169 <preprocessorList>
1.3170 <Elem>PNG_NO_MMX_CODE</Elem>
1.3171 @@ -23251,7 +23251,7 @@
1.3172 <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
1.3173 <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
1.3174 <pElem>../../jdk/src/share/native/sun/java2d</pElem>
1.3175 - <pElem>../../jdk/makefiles</pElem>
1.3176 + <pElem>../../jdk/make</pElem>
1.3177 </incDir>
1.3178 <preprocessorList>
1.3179 <Elem>HEADLESS</Elem>
1.3180 @@ -23286,7 +23286,7 @@
1.3181 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.3182 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.3183 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.3184 - <pElem>../../jdk/makefiles</pElem>
1.3185 + <pElem>../../jdk/make</pElem>
1.3186 </incDir>
1.3187 <preprocessorList>
1.3188 <Elem>INTERNAL_BUILD</Elem>
1.3189 @@ -23316,7 +23316,7 @@
1.3190 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3191 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3192 <pElem>../../jdk/src/share/native/sun/management</pElem>
1.3193 - <pElem>../../jdk/makefiles</pElem>
1.3194 + <pElem>../../jdk/make</pElem>
1.3195 </incDir>
1.3196 <preprocessorList>
1.3197 <Elem>THIS_FILE="FileSystemImpl.c"</Elem>
1.3198 @@ -23338,7 +23338,7 @@
1.3199 <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
1.3200 <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
1.3201 <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
1.3202 - <pElem>../../jdk/makefiles</pElem>
1.3203 + <pElem>../../jdk/make</pElem>
1.3204 </incDir>
1.3205 <preprocessorList>
1.3206 <Elem>THIS_FILE="ResolverConfigurationImpl.c"</Elem>
1.3207 @@ -23387,7 +23387,7 @@
1.3208 <pElem>../../jdk/src/share/native/java/net</pElem>
1.3209 <pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
1.3210 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.3211 - <pElem>../../jdk/makefiles</pElem>
1.3212 + <pElem>../../jdk/make</pElem>
1.3213 </incDir>
1.3214 </cTool>
1.3215 </folder>
1.3216 @@ -23419,7 +23419,7 @@
1.3217 <incDir>
1.3218 <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
1.3219 <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
1.3220 - <pElem>../../jdk/makefiles</pElem>
1.3221 + <pElem>../../jdk/make</pElem>
1.3222 </incDir>
1.3223 </cTool>
1.3224 </folder>
1.3225 @@ -23430,7 +23430,7 @@
1.3226 <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
1.3227 <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
1.3228 <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
1.3229 - <pElem>../../jdk/makefiles</pElem>
1.3230 + <pElem>../../jdk/make</pElem>
1.3231 </incDir>
1.3232 <preprocessorList>
1.3233 <Elem>THIS_FILE="p11_md.c"</Elem>
1.3234 @@ -23443,7 +23443,7 @@
1.3235 <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
1.3236 <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
1.3237 <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
1.3238 - <pElem>../../jdk/makefiles</pElem>
1.3239 + <pElem>../../jdk/make</pElem>
1.3240 </incDir>
1.3241 <preprocessorList>
1.3242 <Elem>THIS_FILE="pcsc_md.c"</Elem>
1.3243 @@ -23461,7 +23461,7 @@
1.3244 <pElem>../../jdk/src/share/native/common</pElem>
1.3245 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3246 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3247 - <pElem>../../jdk/makefiles</pElem>
1.3248 + <pElem>../../jdk/make</pElem>
1.3249 </incDir>
1.3250 <preprocessorList>
1.3251 <Elem>THIS_FILE="LinuxVirtualMachine.c"</Elem>
1.3252 @@ -23479,7 +23479,7 @@
1.3253 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3254 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3255 <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
1.3256 - <pElem>../../jdk/makefiles</pElem>
1.3257 + <pElem>../../jdk/make</pElem>
1.3258 </incDir>
1.3259 <preprocessorList>
1.3260 <Elem>THIS_FILE="jvm_symbols_md.c"</Elem>
1.3261 @@ -23511,7 +23511,7 @@
1.3262 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3263 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3264 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3265 - <pElem>../../jdk/makefiles</pElem>
1.3266 + <pElem>../../jdk/make</pElem>
1.3267 </incDir>
1.3268 <preprocessorList>
1.3269 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3270 @@ -23549,7 +23549,7 @@
1.3271 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.3272 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.3273 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.3274 - <pElem>../../jdk/makefiles</pElem>
1.3275 + <pElem>../../jdk/make</pElem>
1.3276 </incDir>
1.3277 <preprocessorList>
1.3278 <Elem>INTERNAL_BUILD</Elem>
1.3279 @@ -23573,7 +23573,7 @@
1.3280 <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3281 <pElem>../../jdk/src/share/npt</pElem>
1.3282 <pElem>../../jdk/src/solaris/npt</pElem>
1.3283 - <pElem>../../jdk/makefiles</pElem>
1.3284 + <pElem>../../jdk/make</pElem>
1.3285 </incDir>
1.3286 <preprocessorList>
1.3287 <Elem>THIS_FILE="utf_md.c"</Elem>
1.3288 @@ -23594,7 +23594,7 @@
1.3289 <pElem>../../jdk/src/solaris/transport/socket</pElem>
1.3290 <pElem>../../jdk/src/share/back/export</pElem>
1.3291 <pElem>../../jdk/src/share/back</pElem>
1.3292 - <pElem>../../jdk/makefiles</pElem>
1.3293 + <pElem>../../jdk/make</pElem>
1.3294 </incDir>
1.3295 <preprocessorList>
1.3296 <Elem>THIS_FILE="socket_md.c"</Elem>
1.3297 @@ -28097,7 +28097,7 @@
1.3298 <pElem>../../jdk/src/share/bin</pElem>
1.3299 <pElem>../../jdk/src/solaris/bin</pElem>
1.3300 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.3301 - <pElem>../../jdk/makefiles</pElem>
1.3302 + <pElem>../../jdk/make</pElem>
1.3303 </incDir>
1.3304 <preprocessorList>
1.3305 <Elem>LIBARCH32NAME="i386"</Elem>
1.3306 @@ -28112,7 +28112,7 @@
1.3307 <pElem>../../jdk/src/share/bin</pElem>
1.3308 <pElem>../../jdk/src/solaris/bin</pElem>
1.3309 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.3310 - <pElem>../../jdk/makefiles</pElem>
1.3311 + <pElem>../../jdk/make</pElem>
1.3312 </incDir>
1.3313 <preprocessorList>
1.3314 <Elem>LIBARCH32NAME="i386"</Elem>
1.3315 @@ -28126,7 +28126,7 @@
1.3316 <incDir>
1.3317 <pElem>../../jdk/src/share/bin</pElem>
1.3318 <pElem>../../jdk/src/solaris/bin</pElem>
1.3319 - <pElem>../../jdk/makefiles</pElem>
1.3320 + <pElem>../../jdk/make</pElem>
1.3321 </incDir>
1.3322 <preprocessorList>
1.3323 <Elem>EXPAND_CLASSPATH_WILDCARDS</Elem>
1.3324 @@ -28152,7 +28152,7 @@
1.3325 <pElem>../../jdk/src/share/bin</pElem>
1.3326 <pElem>../../jdk/src/solaris/bin</pElem>
1.3327 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.3328 - <pElem>../../jdk/makefiles</pElem>
1.3329 + <pElem>../../jdk/make</pElem>
1.3330 </incDir>
1.3331 <preprocessorList>
1.3332 <Elem>LIBARCH32NAME="i386"</Elem>
1.3333 @@ -28171,7 +28171,7 @@
1.3334 <pElem>../../jdk/src/share/bin</pElem>
1.3335 <pElem>../../jdk/src/solaris/bin</pElem>
1.3336 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.3337 - <pElem>../../jdk/makefiles</pElem>
1.3338 + <pElem>../../jdk/make</pElem>
1.3339 </incDir>
1.3340 <preprocessorList>
1.3341 <Elem>LIBARCH32NAME="i386"</Elem>
1.3342 @@ -28190,7 +28190,7 @@
1.3343 <pElem>../../jdk/src/share/bin</pElem>
1.3344 <pElem>../../jdk/src/solaris/bin</pElem>
1.3345 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.3346 - <pElem>../../jdk/makefiles</pElem>
1.3347 + <pElem>../../jdk/make</pElem>
1.3348 </incDir>
1.3349 <preprocessorList>
1.3350 <Elem>LIBARCH32NAME="i386"</Elem>
1.3351 @@ -28206,7 +28206,7 @@
1.3352 <pElem>../../jdk/src/share/bin</pElem>
1.3353 <pElem>../../jdk/src/solaris/bin</pElem>
1.3354 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.3355 - <pElem>../../jdk/makefiles</pElem>
1.3356 + <pElem>../../jdk/make</pElem>
1.3357 </incDir>
1.3358 <preprocessorList>
1.3359 <Elem>LIBARCH32NAME="i386"</Elem>
1.3360 @@ -28648,7 +28648,7 @@
1.3361 <pElem>../../jdk/src/share/native/common</pElem>
1.3362 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3363 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3364 - <pElem>../../jdk/makefiles</pElem>
1.3365 + <pElem>../../jdk/make</pElem>
1.3366 </incDir>
1.3367 <preprocessorList>
1.3368 <Elem>NO_ZLIB</Elem>
1.3369 @@ -28669,7 +28669,7 @@
1.3370 <pElem>../../jdk/src/share/native/common</pElem>
1.3371 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3372 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3373 - <pElem>../../jdk/makefiles</pElem>
1.3374 + <pElem>../../jdk/make</pElem>
1.3375 </incDir>
1.3376 <preprocessorList>
1.3377 <Elem>NO_ZLIB</Elem>
1.3378 @@ -28691,7 +28691,7 @@
1.3379 <pElem>../../jdk/src/share/native/common</pElem>
1.3380 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3381 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3382 - <pElem>../../jdk/makefiles</pElem>
1.3383 + <pElem>../../jdk/make</pElem>
1.3384 </incDir>
1.3385 <preprocessorList>
1.3386 <Elem>NO_ZLIB</Elem>
1.3387 @@ -28713,7 +28713,7 @@
1.3388 <pElem>../../jdk/src/share/native/common</pElem>
1.3389 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3390 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3391 - <pElem>../../jdk/makefiles</pElem>
1.3392 + <pElem>../../jdk/make</pElem>
1.3393 </incDir>
1.3394 <preprocessorList>
1.3395 <Elem>NO_ZLIB</Elem>
1.3396 @@ -28735,7 +28735,7 @@
1.3397 <pElem>../../jdk/src/solaris/javavm/export</pElem>
1.3398 <pElem>../../jdk/src/share/native/common</pElem>
1.3399 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3400 - <pElem>../../jdk/makefiles</pElem>
1.3401 + <pElem>../../jdk/make</pElem>
1.3402 </incDir>
1.3403 <preprocessorList>
1.3404 <Elem>THIS_FILE="main.cpp"</Elem>
1.3405 @@ -28755,7 +28755,7 @@
1.3406 <pElem>../../jdk/src/share/native/common</pElem>
1.3407 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3408 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3409 - <pElem>../../jdk/makefiles</pElem>
1.3410 + <pElem>../../jdk/make</pElem>
1.3411 </incDir>
1.3412 <preprocessorList>
1.3413 <Elem>NO_ZLIB</Elem>
1.3414 @@ -28777,7 +28777,7 @@
1.3415 <pElem>../../jdk/src/share/native/common</pElem>
1.3416 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3417 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3418 - <pElem>../../jdk/makefiles</pElem>
1.3419 + <pElem>../../jdk/make</pElem>
1.3420 </incDir>
1.3421 <preprocessorList>
1.3422 <Elem>NO_ZLIB</Elem>
1.3423 @@ -28799,7 +28799,7 @@
1.3424 <pElem>../../jdk/src/share/native/common</pElem>
1.3425 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3426 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3427 - <pElem>../../jdk/makefiles</pElem>
1.3428 + <pElem>../../jdk/make</pElem>
1.3429 </incDir>
1.3430 <preprocessorList>
1.3431 <Elem>NO_ZLIB</Elem>
1.3432 @@ -28919,7 +28919,7 @@
1.3433 flavor2="0">
1.3434 <cTool>
1.3435 <incDir>
1.3436 - <pElem>../../jdk/makefiles</pElem>
1.3437 + <pElem>../../jdk/make</pElem>
1.3438 </incDir>
1.3439 </cTool>
1.3440 </item>
1.3441 @@ -28929,7 +28929,7 @@
1.3442 flavor2="0">
1.3443 <cTool>
1.3444 <incDir>
1.3445 - <pElem>../../jdk/makefiles</pElem>
1.3446 + <pElem>../../jdk/make</pElem>
1.3447 </incDir>
1.3448 <preprocessorList>
1.3449 <Elem>THIS_FILE="check_format.c"</Elem>
1.3450 @@ -28957,7 +28957,7 @@
1.3451 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3452 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3453 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3454 - <pElem>../../jdk/makefiles</pElem>
1.3455 + <pElem>../../jdk/make</pElem>
1.3456 </incDir>
1.3457 <preprocessorList>
1.3458 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3459 @@ -28990,7 +28990,7 @@
1.3460 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3461 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3462 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3463 - <pElem>../../jdk/makefiles</pElem>
1.3464 + <pElem>../../jdk/make</pElem>
1.3465 </incDir>
1.3466 <preprocessorList>
1.3467 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3468 @@ -29023,7 +29023,7 @@
1.3469 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3470 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3471 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3472 - <pElem>../../jdk/makefiles</pElem>
1.3473 + <pElem>../../jdk/make</pElem>
1.3474 </incDir>
1.3475 <preprocessorList>
1.3476 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3477 @@ -29056,7 +29056,7 @@
1.3478 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3479 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3480 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3481 - <pElem>../../jdk/makefiles</pElem>
1.3482 + <pElem>../../jdk/make</pElem>
1.3483 </incDir>
1.3484 <preprocessorList>
1.3485 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3486 @@ -29089,7 +29089,7 @@
1.3487 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3488 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3489 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3490 - <pElem>../../jdk/makefiles</pElem>
1.3491 + <pElem>../../jdk/make</pElem>
1.3492 </incDir>
1.3493 <preprocessorList>
1.3494 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3495 @@ -29177,7 +29177,7 @@
1.3496 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3497 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3498 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3499 - <pElem>../../jdk/makefiles</pElem>
1.3500 + <pElem>../../jdk/make</pElem>
1.3501 </incDir>
1.3502 <preprocessorList>
1.3503 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3504 @@ -29210,7 +29210,7 @@
1.3505 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3506 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3507 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3508 - <pElem>../../jdk/makefiles</pElem>
1.3509 + <pElem>../../jdk/make</pElem>
1.3510 </incDir>
1.3511 <preprocessorList>
1.3512 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3513 @@ -29243,7 +29243,7 @@
1.3514 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3515 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3516 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3517 - <pElem>../../jdk/makefiles</pElem>
1.3518 + <pElem>../../jdk/make</pElem>
1.3519 </incDir>
1.3520 <preprocessorList>
1.3521 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3522 @@ -29276,7 +29276,7 @@
1.3523 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3524 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3525 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3526 - <pElem>../../jdk/makefiles</pElem>
1.3527 + <pElem>../../jdk/make</pElem>
1.3528 </incDir>
1.3529 <preprocessorList>
1.3530 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3531 @@ -29309,7 +29309,7 @@
1.3532 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3533 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3534 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3535 - <pElem>../../jdk/makefiles</pElem>
1.3536 + <pElem>../../jdk/make</pElem>
1.3537 </incDir>
1.3538 <preprocessorList>
1.3539 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3540 @@ -29342,7 +29342,7 @@
1.3541 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3542 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3543 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3544 - <pElem>../../jdk/makefiles</pElem>
1.3545 + <pElem>../../jdk/make</pElem>
1.3546 </incDir>
1.3547 <preprocessorList>
1.3548 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3549 @@ -29375,7 +29375,7 @@
1.3550 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3551 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3552 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3553 - <pElem>../../jdk/makefiles</pElem>
1.3554 + <pElem>../../jdk/make</pElem>
1.3555 </incDir>
1.3556 <preprocessorList>
1.3557 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3558 @@ -29408,7 +29408,7 @@
1.3559 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3560 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3561 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3562 - <pElem>../../jdk/makefiles</pElem>
1.3563 + <pElem>../../jdk/make</pElem>
1.3564 </incDir>
1.3565 <preprocessorList>
1.3566 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3567 @@ -29441,7 +29441,7 @@
1.3568 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3569 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3570 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3571 - <pElem>../../jdk/makefiles</pElem>
1.3572 + <pElem>../../jdk/make</pElem>
1.3573 </incDir>
1.3574 <preprocessorList>
1.3575 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3576 @@ -29474,7 +29474,7 @@
1.3577 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3578 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3579 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3580 - <pElem>../../jdk/makefiles</pElem>
1.3581 + <pElem>../../jdk/make</pElem>
1.3582 </incDir>
1.3583 <preprocessorList>
1.3584 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3585 @@ -29507,7 +29507,7 @@
1.3586 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3587 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3588 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3589 - <pElem>../../jdk/makefiles</pElem>
1.3590 + <pElem>../../jdk/make</pElem>
1.3591 </incDir>
1.3592 <preprocessorList>
1.3593 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3594 @@ -29540,7 +29540,7 @@
1.3595 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3596 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3597 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3598 - <pElem>../../jdk/makefiles</pElem>
1.3599 + <pElem>../../jdk/make</pElem>
1.3600 </incDir>
1.3601 <preprocessorList>
1.3602 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3603 @@ -29573,7 +29573,7 @@
1.3604 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3605 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3606 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3607 - <pElem>../../jdk/makefiles</pElem>
1.3608 + <pElem>../../jdk/make</pElem>
1.3609 </incDir>
1.3610 <preprocessorList>
1.3611 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3612 @@ -29606,7 +29606,7 @@
1.3613 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3614 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3615 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3616 - <pElem>../../jdk/makefiles</pElem>
1.3617 + <pElem>../../jdk/make</pElem>
1.3618 </incDir>
1.3619 <preprocessorList>
1.3620 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3621 @@ -29639,7 +29639,7 @@
1.3622 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3623 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3624 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3625 - <pElem>../../jdk/makefiles</pElem>
1.3626 + <pElem>../../jdk/make</pElem>
1.3627 </incDir>
1.3628 <preprocessorList>
1.3629 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3630 @@ -29672,7 +29672,7 @@
1.3631 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3632 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3633 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3634 - <pElem>../../jdk/makefiles</pElem>
1.3635 + <pElem>../../jdk/make</pElem>
1.3636 </incDir>
1.3637 <preprocessorList>
1.3638 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3639 @@ -30412,7 +30412,7 @@
1.3640 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.3641 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.3642 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.3643 - <pElem>../../jdk/makefiles</pElem>
1.3644 + <pElem>../../jdk/make</pElem>
1.3645 </incDir>
1.3646 <preprocessorList>
1.3647 <Elem>ARCHPROPNAME="amd64"</Elem>
1.3648 @@ -30445,7 +30445,7 @@
1.3649 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.3650 <pElem>../../jdk/src/share/native/java/io</pElem>
1.3651 <pElem>../../jdk/src/solaris/native/java/io</pElem>
1.3652 - <pElem>../../jdk/makefiles</pElem>
1.3653 + <pElem>../../jdk/make</pElem>
1.3654 </incDir>
1.3655 <preprocessorList>
1.3656 <Elem>THIS_FILE="Adler32.c"</Elem>
1.3657 @@ -30472,7 +30472,7 @@
1.3658 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.3659 <pElem>../../jdk/src/share/native/java/io</pElem>
1.3660 <pElem>../../jdk/src/solaris/native/java/io</pElem>
1.3661 - <pElem>../../jdk/makefiles</pElem>
1.3662 + <pElem>../../jdk/make</pElem>
1.3663 </incDir>
1.3664 <preprocessorList>
1.3665 <Elem>THIS_FILE="CRC32.c"</Elem>
1.3666 @@ -30499,7 +30499,7 @@
1.3667 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.3668 <pElem>../../jdk/src/share/native/java/io</pElem>
1.3669 <pElem>../../jdk/src/solaris/native/java/io</pElem>
1.3670 - <pElem>../../jdk/makefiles</pElem>
1.3671 + <pElem>../../jdk/make</pElem>
1.3672 </incDir>
1.3673 <preprocessorList>
1.3674 <Elem>THIS_FILE="Deflater.c"</Elem>
1.3675 @@ -30526,7 +30526,7 @@
1.3676 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.3677 <pElem>../../jdk/src/share/native/java/io</pElem>
1.3678 <pElem>../../jdk/src/solaris/native/java/io</pElem>
1.3679 - <pElem>../../jdk/makefiles</pElem>
1.3680 + <pElem>../../jdk/make</pElem>
1.3681 </incDir>
1.3682 <preprocessorList>
1.3683 <Elem>THIS_FILE="Inflater.c"</Elem>
1.3684 @@ -30553,7 +30553,7 @@
1.3685 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.3686 <pElem>../../jdk/src/share/native/java/io</pElem>
1.3687 <pElem>../../jdk/src/solaris/native/java/io</pElem>
1.3688 - <pElem>../../jdk/makefiles</pElem>
1.3689 + <pElem>../../jdk/make</pElem>
1.3690 </incDir>
1.3691 <preprocessorList>
1.3692 <Elem>THIS_FILE="ZipFile.c"</Elem>
1.3693 @@ -30580,7 +30580,7 @@
1.3694 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.3695 <pElem>../../jdk/src/share/native/java/io</pElem>
1.3696 <pElem>../../jdk/src/solaris/native/java/io</pElem>
1.3697 - <pElem>../../jdk/makefiles</pElem>
1.3698 + <pElem>../../jdk/make</pElem>
1.3699 </incDir>
1.3700 <preprocessorList>
1.3701 <Elem>THIS_FILE="zip_util.c"</Elem>
1.3702 @@ -30825,7 +30825,7 @@
1.3703 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.3704 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.3705 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.3706 - <pElem>../../jdk/makefiles</pElem>
1.3707 + <pElem>../../jdk/make</pElem>
1.3708 </incDir>
1.3709 <preprocessorList>
1.3710 <Elem>INTERNAL_BUILD</Elem>
1.3711 @@ -30864,7 +30864,7 @@
1.3712 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.3713 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.3714 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.3715 - <pElem>../../jdk/makefiles</pElem>
1.3716 + <pElem>../../jdk/make</pElem>
1.3717 </incDir>
1.3718 <preprocessorList>
1.3719 <Elem>INTERNAL_BUILD</Elem>
1.3720 @@ -30903,7 +30903,7 @@
1.3721 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.3722 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.3723 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.3724 - <pElem>../../jdk/makefiles</pElem>
1.3725 + <pElem>../../jdk/make</pElem>
1.3726 </incDir>
1.3727 <preprocessorList>
1.3728 <Elem>INTERNAL_BUILD</Elem>
1.3729 @@ -30942,7 +30942,7 @@
1.3730 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.3731 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.3732 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.3733 - <pElem>../../jdk/makefiles</pElem>
1.3734 + <pElem>../../jdk/make</pElem>
1.3735 </incDir>
1.3736 <preprocessorList>
1.3737 <Elem>INTERNAL_BUILD</Elem>
1.3738 @@ -30996,7 +30996,7 @@
1.3739 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.3740 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.3741 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.3742 - <pElem>../../jdk/makefiles</pElem>
1.3743 + <pElem>../../jdk/make</pElem>
1.3744 </incDir>
1.3745 <preprocessorList>
1.3746 <Elem>INTERNAL_BUILD</Elem>
1.3747 @@ -31040,7 +31040,7 @@
1.3748 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.3749 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.3750 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.3751 - <pElem>../../jdk/makefiles</pElem>
1.3752 + <pElem>../../jdk/make</pElem>
1.3753 </incDir>
1.3754 <preprocessorList>
1.3755 <Elem>INTERNAL_BUILD</Elem>
1.3756 @@ -31064,7 +31064,7 @@
1.3757 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3758 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3759 <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
1.3760 - <pElem>../../jdk/makefiles</pElem>
1.3761 + <pElem>../../jdk/make</pElem>
1.3762 </incDir>
1.3763 </cTool>
1.3764 </item>
1.3765 @@ -31089,7 +31089,7 @@
1.3766 <pElem>../../jdk/src/share/native/common</pElem>
1.3767 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3768 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3769 - <pElem>../../jdk/makefiles</pElem>
1.3770 + <pElem>../../jdk/make</pElem>
1.3771 </incDir>
1.3772 <preprocessorList>
1.3773 <Elem>PNG_NO_MMX_CODE</Elem>
1.3774 @@ -31120,7 +31120,7 @@
1.3775 <pElem>../../jdk/src/share/native/common</pElem>
1.3776 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3777 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3778 - <pElem>../../jdk/makefiles</pElem>
1.3779 + <pElem>../../jdk/make</pElem>
1.3780 </incDir>
1.3781 <preprocessorList>
1.3782 <Elem>PNG_NO_MMX_CODE</Elem>
1.3783 @@ -31151,7 +31151,7 @@
1.3784 <pElem>../../jdk/src/share/native/common</pElem>
1.3785 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3786 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3787 - <pElem>../../jdk/makefiles</pElem>
1.3788 + <pElem>../../jdk/make</pElem>
1.3789 </incDir>
1.3790 <preprocessorList>
1.3791 <Elem>PNG_NO_MMX_CODE</Elem>
1.3792 @@ -31182,7 +31182,7 @@
1.3793 <pElem>../../jdk/src/share/native/common</pElem>
1.3794 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3795 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3796 - <pElem>../../jdk/makefiles</pElem>
1.3797 + <pElem>../../jdk/make</pElem>
1.3798 </incDir>
1.3799 <preprocessorList>
1.3800 <Elem>PNG_NO_MMX_CODE</Elem>
1.3801 @@ -31213,7 +31213,7 @@
1.3802 <pElem>../../jdk/src/share/native/common</pElem>
1.3803 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3804 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3805 - <pElem>../../jdk/makefiles</pElem>
1.3806 + <pElem>../../jdk/make</pElem>
1.3807 </incDir>
1.3808 <preprocessorList>
1.3809 <Elem>PNG_NO_MMX_CODE</Elem>
1.3810 @@ -31244,7 +31244,7 @@
1.3811 <pElem>../../jdk/src/share/native/common</pElem>
1.3812 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3813 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3814 - <pElem>../../jdk/makefiles</pElem>
1.3815 + <pElem>../../jdk/make</pElem>
1.3816 </incDir>
1.3817 <preprocessorList>
1.3818 <Elem>PNG_NO_MMX_CODE</Elem>
1.3819 @@ -31275,7 +31275,7 @@
1.3820 <pElem>../../jdk/src/share/native/common</pElem>
1.3821 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3822 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3823 - <pElem>../../jdk/makefiles</pElem>
1.3824 + <pElem>../../jdk/make</pElem>
1.3825 </incDir>
1.3826 <preprocessorList>
1.3827 <Elem>PNG_NO_MMX_CODE</Elem>
1.3828 @@ -31306,7 +31306,7 @@
1.3829 <pElem>../../jdk/src/share/native/common</pElem>
1.3830 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3831 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3832 - <pElem>../../jdk/makefiles</pElem>
1.3833 + <pElem>../../jdk/make</pElem>
1.3834 </incDir>
1.3835 <preprocessorList>
1.3836 <Elem>PNG_NO_MMX_CODE</Elem>
1.3837 @@ -31337,7 +31337,7 @@
1.3838 <pElem>../../jdk/src/share/native/common</pElem>
1.3839 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3840 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3841 - <pElem>../../jdk/makefiles</pElem>
1.3842 + <pElem>../../jdk/make</pElem>
1.3843 </incDir>
1.3844 <preprocessorList>
1.3845 <Elem>PNG_NO_MMX_CODE</Elem>
1.3846 @@ -31368,7 +31368,7 @@
1.3847 <pElem>../../jdk/src/share/native/common</pElem>
1.3848 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3849 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3850 - <pElem>../../jdk/makefiles</pElem>
1.3851 + <pElem>../../jdk/make</pElem>
1.3852 </incDir>
1.3853 <preprocessorList>
1.3854 <Elem>PNG_NO_MMX_CODE</Elem>
1.3855 @@ -31399,7 +31399,7 @@
1.3856 <pElem>../../jdk/src/share/native/common</pElem>
1.3857 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3858 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3859 - <pElem>../../jdk/makefiles</pElem>
1.3860 + <pElem>../../jdk/make</pElem>
1.3861 </incDir>
1.3862 <preprocessorList>
1.3863 <Elem>PNG_NO_MMX_CODE</Elem>
1.3864 @@ -31430,7 +31430,7 @@
1.3865 <pElem>../../jdk/src/share/native/common</pElem>
1.3866 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3867 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3868 - <pElem>../../jdk/makefiles</pElem>
1.3869 + <pElem>../../jdk/make</pElem>
1.3870 </incDir>
1.3871 <preprocessorList>
1.3872 <Elem>PNG_NO_MMX_CODE</Elem>
1.3873 @@ -31461,7 +31461,7 @@
1.3874 <pElem>../../jdk/src/share/native/common</pElem>
1.3875 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3876 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3877 - <pElem>../../jdk/makefiles</pElem>
1.3878 + <pElem>../../jdk/make</pElem>
1.3879 </incDir>
1.3880 <preprocessorList>
1.3881 <Elem>PNG_NO_MMX_CODE</Elem>
1.3882 @@ -31492,7 +31492,7 @@
1.3883 <pElem>../../jdk/src/share/native/common</pElem>
1.3884 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3885 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3886 - <pElem>../../jdk/makefiles</pElem>
1.3887 + <pElem>../../jdk/make</pElem>
1.3888 </incDir>
1.3889 <preprocessorList>
1.3890 <Elem>PNG_NO_MMX_CODE</Elem>
1.3891 @@ -31523,7 +31523,7 @@
1.3892 <pElem>../../jdk/src/share/native/common</pElem>
1.3893 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3894 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3895 - <pElem>../../jdk/makefiles</pElem>
1.3896 + <pElem>../../jdk/make</pElem>
1.3897 </incDir>
1.3898 <preprocessorList>
1.3899 <Elem>PNG_NO_MMX_CODE</Elem>
1.3900 @@ -31554,7 +31554,7 @@
1.3901 <pElem>../../jdk/src/share/native/common</pElem>
1.3902 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3903 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3904 - <pElem>../../jdk/makefiles</pElem>
1.3905 + <pElem>../../jdk/make</pElem>
1.3906 </incDir>
1.3907 <preprocessorList>
1.3908 <Elem>PNG_NO_MMX_CODE</Elem>
1.3909 @@ -31585,7 +31585,7 @@
1.3910 <pElem>../../jdk/src/share/native/common</pElem>
1.3911 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3912 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3913 - <pElem>../../jdk/makefiles</pElem>
1.3914 + <pElem>../../jdk/make</pElem>
1.3915 </incDir>
1.3916 <preprocessorList>
1.3917 <Elem>PNG_NO_MMX_CODE</Elem>
1.3918 @@ -31616,7 +31616,7 @@
1.3919 <pElem>../../jdk/src/share/native/common</pElem>
1.3920 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3921 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3922 - <pElem>../../jdk/makefiles</pElem>
1.3923 + <pElem>../../jdk/make</pElem>
1.3924 </incDir>
1.3925 <preprocessorList>
1.3926 <Elem>PNG_NO_MMX_CODE</Elem>
1.3927 @@ -31647,7 +31647,7 @@
1.3928 <pElem>../../jdk/src/share/native/common</pElem>
1.3929 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3930 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3931 - <pElem>../../jdk/makefiles</pElem>
1.3932 + <pElem>../../jdk/make</pElem>
1.3933 </incDir>
1.3934 <preprocessorList>
1.3935 <Elem>PNG_NO_MMX_CODE</Elem>
1.3936 @@ -31678,7 +31678,7 @@
1.3937 <pElem>../../jdk/src/share/native/common</pElem>
1.3938 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3939 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3940 - <pElem>../../jdk/makefiles</pElem>
1.3941 + <pElem>../../jdk/make</pElem>
1.3942 </incDir>
1.3943 <preprocessorList>
1.3944 <Elem>PNG_NO_MMX_CODE</Elem>
1.3945 @@ -31709,7 +31709,7 @@
1.3946 <pElem>../../jdk/src/share/native/common</pElem>
1.3947 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3948 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3949 - <pElem>../../jdk/makefiles</pElem>
1.3950 + <pElem>../../jdk/make</pElem>
1.3951 </incDir>
1.3952 <preprocessorList>
1.3953 <Elem>PNG_NO_MMX_CODE</Elem>
1.3954 @@ -31740,7 +31740,7 @@
1.3955 <pElem>../../jdk/src/share/native/common</pElem>
1.3956 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3957 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3958 - <pElem>../../jdk/makefiles</pElem>
1.3959 + <pElem>../../jdk/make</pElem>
1.3960 </incDir>
1.3961 <preprocessorList>
1.3962 <Elem>PNG_NO_MMX_CODE</Elem>
1.3963 @@ -31771,7 +31771,7 @@
1.3964 <pElem>../../jdk/src/share/native/common</pElem>
1.3965 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3966 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3967 - <pElem>../../jdk/makefiles</pElem>
1.3968 + <pElem>../../jdk/make</pElem>
1.3969 </incDir>
1.3970 <preprocessorList>
1.3971 <Elem>PNG_NO_MMX_CODE</Elem>
1.3972 @@ -31802,7 +31802,7 @@
1.3973 <pElem>../../jdk/src/share/native/common</pElem>
1.3974 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3975 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3976 - <pElem>../../jdk/makefiles</pElem>
1.3977 + <pElem>../../jdk/make</pElem>
1.3978 </incDir>
1.3979 <preprocessorList>
1.3980 <Elem>PNG_NO_MMX_CODE</Elem>
1.3981 @@ -31833,7 +31833,7 @@
1.3982 <pElem>../../jdk/src/share/native/common</pElem>
1.3983 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3984 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3985 - <pElem>../../jdk/makefiles</pElem>
1.3986 + <pElem>../../jdk/make</pElem>
1.3987 </incDir>
1.3988 <preprocessorList>
1.3989 <Elem>PNG_NO_MMX_CODE</Elem>
1.3990 @@ -31864,7 +31864,7 @@
1.3991 <pElem>../../jdk/src/share/native/common</pElem>
1.3992 <pElem>../../jdk/src/solaris/native/common</pElem>
1.3993 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.3994 - <pElem>../../jdk/makefiles</pElem>
1.3995 + <pElem>../../jdk/make</pElem>
1.3996 </incDir>
1.3997 <preprocessorList>
1.3998 <Elem>PNG_NO_MMX_CODE</Elem>
1.3999 @@ -31895,7 +31895,7 @@
1.4000 <pElem>../../jdk/src/share/native/common</pElem>
1.4001 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4002 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4003 - <pElem>../../jdk/makefiles</pElem>
1.4004 + <pElem>../../jdk/make</pElem>
1.4005 </incDir>
1.4006 <preprocessorList>
1.4007 <Elem>PNG_NO_MMX_CODE</Elem>
1.4008 @@ -31926,7 +31926,7 @@
1.4009 <pElem>../../jdk/src/share/native/common</pElem>
1.4010 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4011 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4012 - <pElem>../../jdk/makefiles</pElem>
1.4013 + <pElem>../../jdk/make</pElem>
1.4014 </incDir>
1.4015 <preprocessorList>
1.4016 <Elem>PNG_NO_MMX_CODE</Elem>
1.4017 @@ -31957,7 +31957,7 @@
1.4018 <pElem>../../jdk/src/share/native/common</pElem>
1.4019 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4020 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4021 - <pElem>../../jdk/makefiles</pElem>
1.4022 + <pElem>../../jdk/make</pElem>
1.4023 </incDir>
1.4024 <preprocessorList>
1.4025 <Elem>PNG_NO_MMX_CODE</Elem>
1.4026 @@ -31988,7 +31988,7 @@
1.4027 <pElem>../../jdk/src/share/native/common</pElem>
1.4028 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4029 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4030 - <pElem>../../jdk/makefiles</pElem>
1.4031 + <pElem>../../jdk/make</pElem>
1.4032 </incDir>
1.4033 <preprocessorList>
1.4034 <Elem>PNG_NO_MMX_CODE</Elem>
1.4035 @@ -32019,7 +32019,7 @@
1.4036 <pElem>../../jdk/src/share/native/common</pElem>
1.4037 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4038 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4039 - <pElem>../../jdk/makefiles</pElem>
1.4040 + <pElem>../../jdk/make</pElem>
1.4041 </incDir>
1.4042 <preprocessorList>
1.4043 <Elem>PNG_NO_MMX_CODE</Elem>
1.4044 @@ -32050,7 +32050,7 @@
1.4045 <pElem>../../jdk/src/share/native/common</pElem>
1.4046 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4047 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4048 - <pElem>../../jdk/makefiles</pElem>
1.4049 + <pElem>../../jdk/make</pElem>
1.4050 </incDir>
1.4051 <preprocessorList>
1.4052 <Elem>PNG_NO_MMX_CODE</Elem>
1.4053 @@ -32081,7 +32081,7 @@
1.4054 <pElem>../../jdk/src/share/native/common</pElem>
1.4055 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4056 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4057 - <pElem>../../jdk/makefiles</pElem>
1.4058 + <pElem>../../jdk/make</pElem>
1.4059 </incDir>
1.4060 <preprocessorList>
1.4061 <Elem>PNG_NO_MMX_CODE</Elem>
1.4062 @@ -32112,7 +32112,7 @@
1.4063 <pElem>../../jdk/src/share/native/common</pElem>
1.4064 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4065 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4066 - <pElem>../../jdk/makefiles</pElem>
1.4067 + <pElem>../../jdk/make</pElem>
1.4068 </incDir>
1.4069 <preprocessorList>
1.4070 <Elem>PNG_NO_MMX_CODE</Elem>
1.4071 @@ -32143,7 +32143,7 @@
1.4072 <pElem>../../jdk/src/share/native/common</pElem>
1.4073 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4074 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4075 - <pElem>../../jdk/makefiles</pElem>
1.4076 + <pElem>../../jdk/make</pElem>
1.4077 </incDir>
1.4078 <preprocessorList>
1.4079 <Elem>PNG_NO_MMX_CODE</Elem>
1.4080 @@ -32174,7 +32174,7 @@
1.4081 <pElem>../../jdk/src/share/native/common</pElem>
1.4082 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4083 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4084 - <pElem>../../jdk/makefiles</pElem>
1.4085 + <pElem>../../jdk/make</pElem>
1.4086 </incDir>
1.4087 <preprocessorList>
1.4088 <Elem>PNG_NO_MMX_CODE</Elem>
1.4089 @@ -32205,7 +32205,7 @@
1.4090 <pElem>../../jdk/src/share/native/common</pElem>
1.4091 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4092 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4093 - <pElem>../../jdk/makefiles</pElem>
1.4094 + <pElem>../../jdk/make</pElem>
1.4095 </incDir>
1.4096 <preprocessorList>
1.4097 <Elem>PNG_NO_MMX_CODE</Elem>
1.4098 @@ -32236,7 +32236,7 @@
1.4099 <pElem>../../jdk/src/share/native/common</pElem>
1.4100 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4101 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4102 - <pElem>../../jdk/makefiles</pElem>
1.4103 + <pElem>../../jdk/make</pElem>
1.4104 </incDir>
1.4105 <preprocessorList>
1.4106 <Elem>PNG_NO_MMX_CODE</Elem>
1.4107 @@ -32267,7 +32267,7 @@
1.4108 <pElem>../../jdk/src/share/native/common</pElem>
1.4109 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4110 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4111 - <pElem>../../jdk/makefiles</pElem>
1.4112 + <pElem>../../jdk/make</pElem>
1.4113 </incDir>
1.4114 <preprocessorList>
1.4115 <Elem>PNG_NO_MMX_CODE</Elem>
1.4116 @@ -32298,7 +32298,7 @@
1.4117 <pElem>../../jdk/src/share/native/common</pElem>
1.4118 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4119 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4120 - <pElem>../../jdk/makefiles</pElem>
1.4121 + <pElem>../../jdk/make</pElem>
1.4122 </incDir>
1.4123 <preprocessorList>
1.4124 <Elem>PNG_NO_MMX_CODE</Elem>
1.4125 @@ -32329,7 +32329,7 @@
1.4126 <pElem>../../jdk/src/share/native/common</pElem>
1.4127 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4128 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4129 - <pElem>../../jdk/makefiles</pElem>
1.4130 + <pElem>../../jdk/make</pElem>
1.4131 </incDir>
1.4132 <preprocessorList>
1.4133 <Elem>PNG_NO_MMX_CODE</Elem>
1.4134 @@ -32353,7 +32353,7 @@
1.4135 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4136 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4137 <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
1.4138 - <pElem>../../jdk/makefiles</pElem>
1.4139 + <pElem>../../jdk/make</pElem>
1.4140 </incDir>
1.4141 <preprocessorList>
1.4142 <Elem>THIS_FILE="jpegdecoder.c"</Elem>
1.4143 @@ -32381,7 +32381,7 @@
1.4144 <pElem>../../jdk/src/share/native/common</pElem>
1.4145 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4146 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4147 - <pElem>../../jdk/makefiles</pElem>
1.4148 + <pElem>../../jdk/make</pElem>
1.4149 </incDir>
1.4150 <preprocessorList>
1.4151 <Elem>PNG_NO_MMX_CODE</Elem>
1.4152 @@ -32412,7 +32412,7 @@
1.4153 <pElem>../../jdk/src/share/native/common</pElem>
1.4154 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4155 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4156 - <pElem>../../jdk/makefiles</pElem>
1.4157 + <pElem>../../jdk/make</pElem>
1.4158 </incDir>
1.4159 <preprocessorList>
1.4160 <Elem>PNG_NO_MMX_CODE</Elem>
1.4161 @@ -32443,7 +32443,7 @@
1.4162 <pElem>../../jdk/src/share/native/common</pElem>
1.4163 <pElem>../../jdk/src/solaris/native/common</pElem>
1.4164 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.4165 - <pElem>../../jdk/makefiles</pElem>
1.4166 + <pElem>../../jdk/make</pElem>
1.4167 </incDir>
1.4168 <preprocessorList>
1.4169 <Elem>PNG_NO_MMX_CODE</Elem>
1.4170 @@ -32620,7 +32620,7 @@
1.4171 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.4172 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.4173 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.4174 - <pElem>../../jdk/makefiles</pElem>
1.4175 + <pElem>../../jdk/make</pElem>
1.4176 </incDir>
1.4177 <preprocessorList>
1.4178 <Elem>INTERNAL_BUILD</Elem>
1.4179 @@ -32635,7 +32635,7 @@
1.4180 <incDir>
1.4181 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4182 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4183 - <pElem>../../jdk/makefiles</pElem>
1.4184 + <pElem>../../jdk/make</pElem>
1.4185 </incDir>
1.4186 <preprocessorList>
1.4187 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4188 @@ -32652,7 +32652,7 @@
1.4189 <incDir>
1.4190 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4191 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4192 - <pElem>../../jdk/makefiles</pElem>
1.4193 + <pElem>../../jdk/make</pElem>
1.4194 </incDir>
1.4195 <preprocessorList>
1.4196 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4197 @@ -32669,7 +32669,7 @@
1.4198 <incDir>
1.4199 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4200 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4201 - <pElem>../../jdk/makefiles</pElem>
1.4202 + <pElem>../../jdk/make</pElem>
1.4203 </incDir>
1.4204 <preprocessorList>
1.4205 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4206 @@ -32686,7 +32686,7 @@
1.4207 <incDir>
1.4208 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4209 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4210 - <pElem>../../jdk/makefiles</pElem>
1.4211 + <pElem>../../jdk/make</pElem>
1.4212 </incDir>
1.4213 <preprocessorList>
1.4214 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4215 @@ -32703,7 +32703,7 @@
1.4216 <incDir>
1.4217 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4218 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4219 - <pElem>../../jdk/makefiles</pElem>
1.4220 + <pElem>../../jdk/make</pElem>
1.4221 </incDir>
1.4222 <preprocessorList>
1.4223 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4224 @@ -32720,7 +32720,7 @@
1.4225 <incDir>
1.4226 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4227 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4228 - <pElem>../../jdk/makefiles</pElem>
1.4229 + <pElem>../../jdk/make</pElem>
1.4230 </incDir>
1.4231 <preprocessorList>
1.4232 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4233 @@ -32737,7 +32737,7 @@
1.4234 <incDir>
1.4235 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4236 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4237 - <pElem>../../jdk/makefiles</pElem>
1.4238 + <pElem>../../jdk/make</pElem>
1.4239 </incDir>
1.4240 <preprocessorList>
1.4241 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4242 @@ -32754,7 +32754,7 @@
1.4243 <incDir>
1.4244 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4245 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4246 - <pElem>../../jdk/makefiles</pElem>
1.4247 + <pElem>../../jdk/make</pElem>
1.4248 </incDir>
1.4249 <preprocessorList>
1.4250 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4251 @@ -32771,7 +32771,7 @@
1.4252 <incDir>
1.4253 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4254 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4255 - <pElem>../../jdk/makefiles</pElem>
1.4256 + <pElem>../../jdk/make</pElem>
1.4257 </incDir>
1.4258 <preprocessorList>
1.4259 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4260 @@ -32788,7 +32788,7 @@
1.4261 <incDir>
1.4262 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4263 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4264 - <pElem>../../jdk/makefiles</pElem>
1.4265 + <pElem>../../jdk/make</pElem>
1.4266 </incDir>
1.4267 <preprocessorList>
1.4268 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4269 @@ -32805,7 +32805,7 @@
1.4270 <incDir>
1.4271 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4272 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4273 - <pElem>../../jdk/makefiles</pElem>
1.4274 + <pElem>../../jdk/make</pElem>
1.4275 </incDir>
1.4276 <preprocessorList>
1.4277 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4278 @@ -32822,7 +32822,7 @@
1.4279 <incDir>
1.4280 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4281 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4282 - <pElem>../../jdk/makefiles</pElem>
1.4283 + <pElem>../../jdk/make</pElem>
1.4284 </incDir>
1.4285 <preprocessorList>
1.4286 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4287 @@ -32839,7 +32839,7 @@
1.4288 <incDir>
1.4289 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4290 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4291 - <pElem>../../jdk/makefiles</pElem>
1.4292 + <pElem>../../jdk/make</pElem>
1.4293 </incDir>
1.4294 <preprocessorList>
1.4295 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4296 @@ -32856,7 +32856,7 @@
1.4297 <incDir>
1.4298 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4299 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4300 - <pElem>../../jdk/makefiles</pElem>
1.4301 + <pElem>../../jdk/make</pElem>
1.4302 </incDir>
1.4303 <preprocessorList>
1.4304 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4305 @@ -32873,7 +32873,7 @@
1.4306 <incDir>
1.4307 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4308 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4309 - <pElem>../../jdk/makefiles</pElem>
1.4310 + <pElem>../../jdk/make</pElem>
1.4311 </incDir>
1.4312 <preprocessorList>
1.4313 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4314 @@ -32890,7 +32890,7 @@
1.4315 <incDir>
1.4316 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4317 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4318 - <pElem>../../jdk/makefiles</pElem>
1.4319 + <pElem>../../jdk/make</pElem>
1.4320 </incDir>
1.4321 <preprocessorList>
1.4322 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4323 @@ -32907,7 +32907,7 @@
1.4324 <incDir>
1.4325 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4326 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4327 - <pElem>../../jdk/makefiles</pElem>
1.4328 + <pElem>../../jdk/make</pElem>
1.4329 </incDir>
1.4330 <preprocessorList>
1.4331 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4332 @@ -32924,7 +32924,7 @@
1.4333 <incDir>
1.4334 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4335 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4336 - <pElem>../../jdk/makefiles</pElem>
1.4337 + <pElem>../../jdk/make</pElem>
1.4338 </incDir>
1.4339 <preprocessorList>
1.4340 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4341 @@ -32941,7 +32941,7 @@
1.4342 <incDir>
1.4343 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4344 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4345 - <pElem>../../jdk/makefiles</pElem>
1.4346 + <pElem>../../jdk/make</pElem>
1.4347 </incDir>
1.4348 <preprocessorList>
1.4349 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4350 @@ -32958,7 +32958,7 @@
1.4351 <incDir>
1.4352 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4353 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4354 - <pElem>../../jdk/makefiles</pElem>
1.4355 + <pElem>../../jdk/make</pElem>
1.4356 </incDir>
1.4357 <preprocessorList>
1.4358 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4359 @@ -32975,7 +32975,7 @@
1.4360 <incDir>
1.4361 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4362 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4363 - <pElem>../../jdk/makefiles</pElem>
1.4364 + <pElem>../../jdk/make</pElem>
1.4365 </incDir>
1.4366 <preprocessorList>
1.4367 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4368 @@ -32992,7 +32992,7 @@
1.4369 <incDir>
1.4370 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4371 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4372 - <pElem>../../jdk/makefiles</pElem>
1.4373 + <pElem>../../jdk/make</pElem>
1.4374 </incDir>
1.4375 <preprocessorList>
1.4376 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4377 @@ -33009,7 +33009,7 @@
1.4378 <incDir>
1.4379 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4380 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4381 - <pElem>../../jdk/makefiles</pElem>
1.4382 + <pElem>../../jdk/make</pElem>
1.4383 </incDir>
1.4384 <preprocessorList>
1.4385 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4386 @@ -33026,7 +33026,7 @@
1.4387 <incDir>
1.4388 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4389 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4390 - <pElem>../../jdk/makefiles</pElem>
1.4391 + <pElem>../../jdk/make</pElem>
1.4392 </incDir>
1.4393 <preprocessorList>
1.4394 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4395 @@ -33043,7 +33043,7 @@
1.4396 <incDir>
1.4397 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4398 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4399 - <pElem>../../jdk/makefiles</pElem>
1.4400 + <pElem>../../jdk/make</pElem>
1.4401 </incDir>
1.4402 <preprocessorList>
1.4403 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4404 @@ -33060,7 +33060,7 @@
1.4405 <incDir>
1.4406 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4407 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4408 - <pElem>../../jdk/makefiles</pElem>
1.4409 + <pElem>../../jdk/make</pElem>
1.4410 </incDir>
1.4411 <preprocessorList>
1.4412 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4413 @@ -33077,7 +33077,7 @@
1.4414 <incDir>
1.4415 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4416 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4417 - <pElem>../../jdk/makefiles</pElem>
1.4418 + <pElem>../../jdk/make</pElem>
1.4419 </incDir>
1.4420 <preprocessorList>
1.4421 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4422 @@ -33094,7 +33094,7 @@
1.4423 <incDir>
1.4424 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4425 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4426 - <pElem>../../jdk/makefiles</pElem>
1.4427 + <pElem>../../jdk/make</pElem>
1.4428 </incDir>
1.4429 <preprocessorList>
1.4430 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4431 @@ -33111,7 +33111,7 @@
1.4432 <incDir>
1.4433 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4434 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4435 - <pElem>../../jdk/makefiles</pElem>
1.4436 + <pElem>../../jdk/make</pElem>
1.4437 </incDir>
1.4438 <preprocessorList>
1.4439 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4440 @@ -33128,7 +33128,7 @@
1.4441 <incDir>
1.4442 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4443 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4444 - <pElem>../../jdk/makefiles</pElem>
1.4445 + <pElem>../../jdk/make</pElem>
1.4446 </incDir>
1.4447 <preprocessorList>
1.4448 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4449 @@ -33145,7 +33145,7 @@
1.4450 <incDir>
1.4451 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4452 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4453 - <pElem>../../jdk/makefiles</pElem>
1.4454 + <pElem>../../jdk/make</pElem>
1.4455 </incDir>
1.4456 <preprocessorList>
1.4457 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4458 @@ -33162,7 +33162,7 @@
1.4459 <incDir>
1.4460 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4461 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4462 - <pElem>../../jdk/makefiles</pElem>
1.4463 + <pElem>../../jdk/make</pElem>
1.4464 </incDir>
1.4465 <preprocessorList>
1.4466 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4467 @@ -33179,7 +33179,7 @@
1.4468 <incDir>
1.4469 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4470 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4471 - <pElem>../../jdk/makefiles</pElem>
1.4472 + <pElem>../../jdk/make</pElem>
1.4473 </incDir>
1.4474 <preprocessorList>
1.4475 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4476 @@ -33196,7 +33196,7 @@
1.4477 <incDir>
1.4478 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4479 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4480 - <pElem>../../jdk/makefiles</pElem>
1.4481 + <pElem>../../jdk/make</pElem>
1.4482 </incDir>
1.4483 <preprocessorList>
1.4484 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4485 @@ -33213,7 +33213,7 @@
1.4486 <incDir>
1.4487 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4488 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4489 - <pElem>../../jdk/makefiles</pElem>
1.4490 + <pElem>../../jdk/make</pElem>
1.4491 </incDir>
1.4492 <preprocessorList>
1.4493 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4494 @@ -33230,7 +33230,7 @@
1.4495 <incDir>
1.4496 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4497 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4498 - <pElem>../../jdk/makefiles</pElem>
1.4499 + <pElem>../../jdk/make</pElem>
1.4500 </incDir>
1.4501 <preprocessorList>
1.4502 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4503 @@ -33247,7 +33247,7 @@
1.4504 <incDir>
1.4505 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4506 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4507 - <pElem>../../jdk/makefiles</pElem>
1.4508 + <pElem>../../jdk/make</pElem>
1.4509 </incDir>
1.4510 <preprocessorList>
1.4511 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4512 @@ -33264,7 +33264,7 @@
1.4513 <incDir>
1.4514 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4515 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4516 - <pElem>../../jdk/makefiles</pElem>
1.4517 + <pElem>../../jdk/make</pElem>
1.4518 </incDir>
1.4519 <preprocessorList>
1.4520 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4521 @@ -33281,7 +33281,7 @@
1.4522 <incDir>
1.4523 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4524 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4525 - <pElem>../../jdk/makefiles</pElem>
1.4526 + <pElem>../../jdk/make</pElem>
1.4527 </incDir>
1.4528 <preprocessorList>
1.4529 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4530 @@ -33298,7 +33298,7 @@
1.4531 <incDir>
1.4532 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4533 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4534 - <pElem>../../jdk/makefiles</pElem>
1.4535 + <pElem>../../jdk/make</pElem>
1.4536 </incDir>
1.4537 <preprocessorList>
1.4538 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4539 @@ -33315,7 +33315,7 @@
1.4540 <incDir>
1.4541 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4542 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4543 - <pElem>../../jdk/makefiles</pElem>
1.4544 + <pElem>../../jdk/make</pElem>
1.4545 </incDir>
1.4546 <preprocessorList>
1.4547 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4548 @@ -33332,7 +33332,7 @@
1.4549 <incDir>
1.4550 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4551 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4552 - <pElem>../../jdk/makefiles</pElem>
1.4553 + <pElem>../../jdk/make</pElem>
1.4554 </incDir>
1.4555 <preprocessorList>
1.4556 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4557 @@ -33349,7 +33349,7 @@
1.4558 <incDir>
1.4559 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4560 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4561 - <pElem>../../jdk/makefiles</pElem>
1.4562 + <pElem>../../jdk/make</pElem>
1.4563 </incDir>
1.4564 <preprocessorList>
1.4565 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4566 @@ -33366,7 +33366,7 @@
1.4567 <incDir>
1.4568 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4569 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4570 - <pElem>../../jdk/makefiles</pElem>
1.4571 + <pElem>../../jdk/make</pElem>
1.4572 </incDir>
1.4573 <preprocessorList>
1.4574 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4575 @@ -33383,7 +33383,7 @@
1.4576 <incDir>
1.4577 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4578 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4579 - <pElem>../../jdk/makefiles</pElem>
1.4580 + <pElem>../../jdk/make</pElem>
1.4581 </incDir>
1.4582 <preprocessorList>
1.4583 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4584 @@ -33400,7 +33400,7 @@
1.4585 <incDir>
1.4586 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4587 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4588 - <pElem>../../jdk/makefiles</pElem>
1.4589 + <pElem>../../jdk/make</pElem>
1.4590 </incDir>
1.4591 <preprocessorList>
1.4592 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4593 @@ -33417,7 +33417,7 @@
1.4594 <incDir>
1.4595 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4596 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4597 - <pElem>../../jdk/makefiles</pElem>
1.4598 + <pElem>../../jdk/make</pElem>
1.4599 </incDir>
1.4600 <preprocessorList>
1.4601 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4602 @@ -33434,7 +33434,7 @@
1.4603 <incDir>
1.4604 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4605 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4606 - <pElem>../../jdk/makefiles</pElem>
1.4607 + <pElem>../../jdk/make</pElem>
1.4608 </incDir>
1.4609 <preprocessorList>
1.4610 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4611 @@ -33451,7 +33451,7 @@
1.4612 <incDir>
1.4613 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4614 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4615 - <pElem>../../jdk/makefiles</pElem>
1.4616 + <pElem>../../jdk/make</pElem>
1.4617 </incDir>
1.4618 <preprocessorList>
1.4619 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4620 @@ -33468,7 +33468,7 @@
1.4621 <incDir>
1.4622 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4623 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4624 - <pElem>../../jdk/makefiles</pElem>
1.4625 + <pElem>../../jdk/make</pElem>
1.4626 </incDir>
1.4627 <preprocessorList>
1.4628 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4629 @@ -33485,7 +33485,7 @@
1.4630 <incDir>
1.4631 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4632 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4633 - <pElem>../../jdk/makefiles</pElem>
1.4634 + <pElem>../../jdk/make</pElem>
1.4635 </incDir>
1.4636 <preprocessorList>
1.4637 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4638 @@ -33502,7 +33502,7 @@
1.4639 <incDir>
1.4640 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4641 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4642 - <pElem>../../jdk/makefiles</pElem>
1.4643 + <pElem>../../jdk/make</pElem>
1.4644 </incDir>
1.4645 <preprocessorList>
1.4646 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4647 @@ -33519,7 +33519,7 @@
1.4648 <incDir>
1.4649 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4650 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4651 - <pElem>../../jdk/makefiles</pElem>
1.4652 + <pElem>../../jdk/make</pElem>
1.4653 </incDir>
1.4654 <preprocessorList>
1.4655 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4656 @@ -33536,7 +33536,7 @@
1.4657 <incDir>
1.4658 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4659 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4660 - <pElem>../../jdk/makefiles</pElem>
1.4661 + <pElem>../../jdk/make</pElem>
1.4662 </incDir>
1.4663 <preprocessorList>
1.4664 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4665 @@ -33553,7 +33553,7 @@
1.4666 <incDir>
1.4667 <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
1.4668 <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
1.4669 - <pElem>../../jdk/makefiles</pElem>
1.4670 + <pElem>../../jdk/make</pElem>
1.4671 </incDir>
1.4672 <preprocessorList>
1.4673 <Elem>MLIB_NO_LIBSUNMATH</Elem>
1.4674 @@ -33644,7 +33644,7 @@
1.4675 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4676 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4677 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4678 - <pElem>../../jdk/makefiles</pElem>
1.4679 + <pElem>../../jdk/make</pElem>
1.4680 </incDir>
1.4681 <preprocessorList>
1.4682 <Elem>FUNCPROTO=15</Elem>
1.4683 @@ -33672,7 +33672,7 @@
1.4684 <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
1.4685 <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
1.4686 <pElem>../../jdk/src/share/native/sun/java2d</pElem>
1.4687 - <pElem>../../jdk/makefiles</pElem>
1.4688 + <pElem>../../jdk/make</pElem>
1.4689 </incDir>
1.4690 <preprocessorList>
1.4691 <Elem>HEADLESS</Elem>
1.4692 @@ -33707,7 +33707,7 @@
1.4693 <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
1.4694 <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
1.4695 <pElem>../../jdk/src/share/native/sun/java2d</pElem>
1.4696 - <pElem>../../jdk/makefiles</pElem>
1.4697 + <pElem>../../jdk/make</pElem>
1.4698 </incDir>
1.4699 <preprocessorList>
1.4700 <Elem>HEADLESS</Elem>
1.4701 @@ -34467,7 +34467,7 @@
1.4702 <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
1.4703 <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
1.4704 <pElem>../../jdk/src/share/native/sun/java2d</pElem>
1.4705 - <pElem>../../jdk/makefiles</pElem>
1.4706 + <pElem>../../jdk/make</pElem>
1.4707 </incDir>
1.4708 <preprocessorList>
1.4709 <Elem>HEADLESS</Elem>
1.4710 @@ -34498,7 +34498,7 @@
1.4711 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.4712 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.4713 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.4714 - <pElem>../../jdk/makefiles</pElem>
1.4715 + <pElem>../../jdk/make</pElem>
1.4716 </incDir>
1.4717 <preprocessorList>
1.4718 <Elem>INTERNAL_BUILD</Elem>
1.4719 @@ -34530,7 +34530,7 @@
1.4720 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.4721 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.4722 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.4723 - <pElem>../../jdk/makefiles</pElem>
1.4724 + <pElem>../../jdk/make</pElem>
1.4725 </incDir>
1.4726 <preprocessorList>
1.4727 <Elem>INTERNAL_BUILD</Elem>
1.4728 @@ -34562,7 +34562,7 @@
1.4729 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.4730 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.4731 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.4732 - <pElem>../../jdk/makefiles</pElem>
1.4733 + <pElem>../../jdk/make</pElem>
1.4734 </incDir>
1.4735 <preprocessorList>
1.4736 <Elem>INTERNAL_BUILD</Elem>
1.4737 @@ -36472,7 +36472,7 @@
1.4738 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4739 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4740 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4741 - <pElem>../../jdk/makefiles</pElem>
1.4742 + <pElem>../../jdk/make</pElem>
1.4743 </incDir>
1.4744 <preprocessorList>
1.4745 <Elem>FUNCPROTO=15</Elem>
1.4746 @@ -36512,7 +36512,7 @@
1.4747 <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
1.4748 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.4749 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.4750 - <pElem>../../jdk/makefiles</pElem>
1.4751 + <pElem>../../jdk/make</pElem>
1.4752 </incDir>
1.4753 <preprocessorList>
1.4754 <Elem>HEADLESS=true</Elem>
1.4755 @@ -36549,7 +36549,7 @@
1.4756 <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
1.4757 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.4758 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.4759 - <pElem>../../jdk/makefiles</pElem>
1.4760 + <pElem>../../jdk/make</pElem>
1.4761 </incDir>
1.4762 <preprocessorList>
1.4763 <Elem>HEADLESS=true</Elem>
1.4764 @@ -36588,7 +36588,7 @@
1.4765 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4766 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4767 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4768 - <pElem>../../jdk/makefiles</pElem>
1.4769 + <pElem>../../jdk/make</pElem>
1.4770 </incDir>
1.4771 <preprocessorList>
1.4772 <Elem>FUNCPROTO=15</Elem>
1.4773 @@ -36630,7 +36630,7 @@
1.4774 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4775 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4776 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4777 - <pElem>../../jdk/makefiles</pElem>
1.4778 + <pElem>../../jdk/make</pElem>
1.4779 </incDir>
1.4780 <preprocessorList>
1.4781 <Elem>FUNCPROTO=15</Elem>
1.4782 @@ -36672,7 +36672,7 @@
1.4783 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4784 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4785 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4786 - <pElem>../../jdk/makefiles</pElem>
1.4787 + <pElem>../../jdk/make</pElem>
1.4788 </incDir>
1.4789 <preprocessorList>
1.4790 <Elem>FUNCPROTO=15</Elem>
1.4791 @@ -36714,7 +36714,7 @@
1.4792 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4793 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4794 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4795 - <pElem>../../jdk/makefiles</pElem>
1.4796 + <pElem>../../jdk/make</pElem>
1.4797 </incDir>
1.4798 <preprocessorList>
1.4799 <Elem>FUNCPROTO=15</Elem>
1.4800 @@ -36756,7 +36756,7 @@
1.4801 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4802 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4803 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4804 - <pElem>../../jdk/makefiles</pElem>
1.4805 + <pElem>../../jdk/make</pElem>
1.4806 </incDir>
1.4807 <preprocessorList>
1.4808 <Elem>FUNCPROTO=15</Elem>
1.4809 @@ -36798,7 +36798,7 @@
1.4810 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4811 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4812 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4813 - <pElem>../../jdk/makefiles</pElem>
1.4814 + <pElem>../../jdk/make</pElem>
1.4815 </incDir>
1.4816 <preprocessorList>
1.4817 <Elem>FUNCPROTO=15</Elem>
1.4818 @@ -36840,7 +36840,7 @@
1.4819 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4820 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4821 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4822 - <pElem>../../jdk/makefiles</pElem>
1.4823 + <pElem>../../jdk/make</pElem>
1.4824 </incDir>
1.4825 <preprocessorList>
1.4826 <Elem>FUNCPROTO=15</Elem>
1.4827 @@ -36882,7 +36882,7 @@
1.4828 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4829 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4830 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4831 - <pElem>../../jdk/makefiles</pElem>
1.4832 + <pElem>../../jdk/make</pElem>
1.4833 </incDir>
1.4834 <preprocessorList>
1.4835 <Elem>FUNCPROTO=15</Elem>
1.4836 @@ -36924,7 +36924,7 @@
1.4837 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.4838 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.4839 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.4840 - <pElem>../../jdk/makefiles</pElem>
1.4841 + <pElem>../../jdk/make</pElem>
1.4842 </incDir>
1.4843 <preprocessorList>
1.4844 <Elem>INTERNAL_BUILD</Elem>
1.4845 @@ -36963,7 +36963,7 @@
1.4846 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.4847 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.4848 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.4849 - <pElem>../../jdk/makefiles</pElem>
1.4850 + <pElem>../../jdk/make</pElem>
1.4851 </incDir>
1.4852 <preprocessorList>
1.4853 <Elem>INTERNAL_BUILD</Elem>
1.4854 @@ -37002,7 +37002,7 @@
1.4855 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4856 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4857 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4858 - <pElem>../../jdk/makefiles</pElem>
1.4859 + <pElem>../../jdk/make</pElem>
1.4860 </incDir>
1.4861 <preprocessorList>
1.4862 <Elem>FUNCPROTO=15</Elem>
1.4863 @@ -37044,7 +37044,7 @@
1.4864 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4865 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4866 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4867 - <pElem>../../jdk/makefiles</pElem>
1.4868 + <pElem>../../jdk/make</pElem>
1.4869 </incDir>
1.4870 <preprocessorList>
1.4871 <Elem>FUNCPROTO=15</Elem>
1.4872 @@ -37086,7 +37086,7 @@
1.4873 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4874 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4875 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4876 - <pElem>../../jdk/makefiles</pElem>
1.4877 + <pElem>../../jdk/make</pElem>
1.4878 </incDir>
1.4879 <preprocessorList>
1.4880 <Elem>FUNCPROTO=15</Elem>
1.4881 @@ -37128,7 +37128,7 @@
1.4882 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4883 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4884 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4885 - <pElem>../../jdk/makefiles</pElem>
1.4886 + <pElem>../../jdk/make</pElem>
1.4887 </incDir>
1.4888 <preprocessorList>
1.4889 <Elem>FUNCPROTO=15</Elem>
1.4890 @@ -37170,7 +37170,7 @@
1.4891 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4892 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4893 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4894 - <pElem>../../jdk/makefiles</pElem>
1.4895 + <pElem>../../jdk/make</pElem>
1.4896 </incDir>
1.4897 <preprocessorList>
1.4898 <Elem>FUNCPROTO=15</Elem>
1.4899 @@ -37212,7 +37212,7 @@
1.4900 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4901 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4902 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4903 - <pElem>../../jdk/makefiles</pElem>
1.4904 + <pElem>../../jdk/make</pElem>
1.4905 </incDir>
1.4906 <preprocessorList>
1.4907 <Elem>FUNCPROTO=15</Elem>
1.4908 @@ -37254,7 +37254,7 @@
1.4909 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4910 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4911 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4912 - <pElem>../../jdk/makefiles</pElem>
1.4913 + <pElem>../../jdk/make</pElem>
1.4914 </incDir>
1.4915 <preprocessorList>
1.4916 <Elem>FUNCPROTO=15</Elem>
1.4917 @@ -37296,7 +37296,7 @@
1.4918 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4919 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4920 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4921 - <pElem>../../jdk/makefiles</pElem>
1.4922 + <pElem>../../jdk/make</pElem>
1.4923 </incDir>
1.4924 <preprocessorList>
1.4925 <Elem>FUNCPROTO=15</Elem>
1.4926 @@ -37338,7 +37338,7 @@
1.4927 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4928 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4929 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4930 - <pElem>../../jdk/makefiles</pElem>
1.4931 + <pElem>../../jdk/make</pElem>
1.4932 </incDir>
1.4933 <preprocessorList>
1.4934 <Elem>FUNCPROTO=15</Elem>
1.4935 @@ -37380,7 +37380,7 @@
1.4936 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4937 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4938 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4939 - <pElem>../../jdk/makefiles</pElem>
1.4940 + <pElem>../../jdk/make</pElem>
1.4941 </incDir>
1.4942 <preprocessorList>
1.4943 <Elem>FUNCPROTO=15</Elem>
1.4944 @@ -37422,7 +37422,7 @@
1.4945 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4946 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4947 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4948 - <pElem>../../jdk/makefiles</pElem>
1.4949 + <pElem>../../jdk/make</pElem>
1.4950 </incDir>
1.4951 <preprocessorList>
1.4952 <Elem>FUNCPROTO=15</Elem>
1.4953 @@ -37464,7 +37464,7 @@
1.4954 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4955 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4956 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4957 - <pElem>../../jdk/makefiles</pElem>
1.4958 + <pElem>../../jdk/make</pElem>
1.4959 </incDir>
1.4960 <preprocessorList>
1.4961 <Elem>FUNCPROTO=15</Elem>
1.4962 @@ -37511,7 +37511,7 @@
1.4963 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4964 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4965 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4966 - <pElem>../../jdk/makefiles</pElem>
1.4967 + <pElem>../../jdk/make</pElem>
1.4968 </incDir>
1.4969 <preprocessorList>
1.4970 <Elem>FUNCPROTO=15</Elem>
1.4971 @@ -37553,7 +37553,7 @@
1.4972 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4973 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4974 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4975 - <pElem>../../jdk/makefiles</pElem>
1.4976 + <pElem>../../jdk/make</pElem>
1.4977 </incDir>
1.4978 <preprocessorList>
1.4979 <Elem>FUNCPROTO=15</Elem>
1.4980 @@ -37595,7 +37595,7 @@
1.4981 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.4982 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.4983 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.4984 - <pElem>../../jdk/makefiles</pElem>
1.4985 + <pElem>../../jdk/make</pElem>
1.4986 </incDir>
1.4987 <preprocessorList>
1.4988 <Elem>FUNCPROTO=15</Elem>
1.4989 @@ -37732,7 +37732,7 @@
1.4990 <pElem>../../jdk/src/share/native/java/io</pElem>
1.4991 <pElem>../../jdk/src/share/native/java/net</pElem>
1.4992 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.4993 - <pElem>../../jdk/makefiles</pElem>
1.4994 + <pElem>../../jdk/make</pElem>
1.4995 </incDir>
1.4996 <preprocessorList>
1.4997 <Elem>THIS_FILE="DatagramChannelImpl.c"</Elem>
1.4998 @@ -37748,7 +37748,7 @@
1.4999 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5000 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5001 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5002 - <pElem>../../jdk/makefiles</pElem>
1.5003 + <pElem>../../jdk/make</pElem>
1.5004 </incDir>
1.5005 <preprocessorList>
1.5006 <Elem>THIS_FILE="DatagramDispatcher.c"</Elem>
1.5007 @@ -37764,7 +37764,7 @@
1.5008 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5009 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5010 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5011 - <pElem>../../jdk/makefiles</pElem>
1.5012 + <pElem>../../jdk/make</pElem>
1.5013 </incDir>
1.5014 <preprocessorList>
1.5015 <Elem>THIS_FILE="DevPollArrayWrapper.c"</Elem>
1.5016 @@ -37780,7 +37780,7 @@
1.5017 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5018 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5019 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5020 - <pElem>../../jdk/makefiles</pElem>
1.5021 + <pElem>../../jdk/make</pElem>
1.5022 </incDir>
1.5023 <preprocessorList>
1.5024 <Elem>THIS_FILE="FileChannelImpl.c"</Elem>
1.5025 @@ -37796,7 +37796,7 @@
1.5026 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5027 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5028 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5029 - <pElem>../../jdk/makefiles</pElem>
1.5030 + <pElem>../../jdk/make</pElem>
1.5031 </incDir>
1.5032 <preprocessorList>
1.5033 <Elem>THIS_FILE="FileDispatcherImpl.c"</Elem>
1.5034 @@ -37812,7 +37812,7 @@
1.5035 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5036 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5037 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5038 - <pElem>../../jdk/makefiles</pElem>
1.5039 + <pElem>../../jdk/make</pElem>
1.5040 </incDir>
1.5041 <preprocessorList>
1.5042 <Elem>THIS_FILE="FileKey.c"</Elem>
1.5043 @@ -37828,7 +37828,7 @@
1.5044 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5045 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5046 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5047 - <pElem>../../jdk/makefiles</pElem>
1.5048 + <pElem>../../jdk/make</pElem>
1.5049 </incDir>
1.5050 <preprocessorList>
1.5051 <Elem>THIS_FILE="IOUtil.c"</Elem>
1.5052 @@ -37844,7 +37844,7 @@
1.5053 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5054 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5055 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5056 - <pElem>../../jdk/makefiles</pElem>
1.5057 + <pElem>../../jdk/make</pElem>
1.5058 </incDir>
1.5059 <preprocessorList>
1.5060 <Elem>THIS_FILE="InheritedChannel.c"</Elem>
1.5061 @@ -37860,7 +37860,7 @@
1.5062 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5063 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5064 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5065 - <pElem>../../jdk/makefiles</pElem>
1.5066 + <pElem>../../jdk/make</pElem>
1.5067 </incDir>
1.5068 <preprocessorList>
1.5069 <Elem>THIS_FILE="NativeThread.c"</Elem>
1.5070 @@ -37876,7 +37876,7 @@
1.5071 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5072 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5073 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5074 - <pElem>../../jdk/makefiles</pElem>
1.5075 + <pElem>../../jdk/make</pElem>
1.5076 </incDir>
1.5077 <preprocessorList>
1.5078 <Elem>THIS_FILE="Net.c"</Elem>
1.5079 @@ -37892,7 +37892,7 @@
1.5080 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5081 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5082 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5083 - <pElem>../../jdk/makefiles</pElem>
1.5084 + <pElem>../../jdk/make</pElem>
1.5085 </incDir>
1.5086 <preprocessorList>
1.5087 <Elem>THIS_FILE="PollArrayWrapper.c"</Elem>
1.5088 @@ -37908,7 +37908,7 @@
1.5089 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5090 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5091 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5092 - <pElem>../../jdk/makefiles</pElem>
1.5093 + <pElem>../../jdk/make</pElem>
1.5094 </incDir>
1.5095 <preprocessorList>
1.5096 <Elem>THIS_FILE="ServerSocketChannelImpl.c"</Elem>
1.5097 @@ -37924,7 +37924,7 @@
1.5098 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5099 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5100 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5101 - <pElem>../../jdk/makefiles</pElem>
1.5102 + <pElem>../../jdk/make</pElem>
1.5103 </incDir>
1.5104 <preprocessorList>
1.5105 <Elem>THIS_FILE="SocketChannelImpl.c"</Elem>
1.5106 @@ -37940,7 +37940,7 @@
1.5107 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5108 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5109 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5110 - <pElem>../../jdk/makefiles</pElem>
1.5111 + <pElem>../../jdk/make</pElem>
1.5112 </incDir>
1.5113 <preprocessorList>
1.5114 <Elem>THIS_FILE="SocketDispatcher.c"</Elem>
1.5115 @@ -37956,7 +37956,7 @@
1.5116 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5117 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5118 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5119 - <pElem>../../jdk/makefiles</pElem>
1.5120 + <pElem>../../jdk/make</pElem>
1.5121 </incDir>
1.5122 <preprocessorList>
1.5123 <Elem>THIS_FILE="SolarisEventPort.c"</Elem>
1.5124 @@ -37972,7 +37972,7 @@
1.5125 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5126 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5127 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5128 - <pElem>../../jdk/makefiles</pElem>
1.5129 + <pElem>../../jdk/make</pElem>
1.5130 </incDir>
1.5131 <preprocessorList>
1.5132 <Elem>THIS_FILE="UnixAsynchronousServerSocketChannelImpl.c"</Elem>
1.5133 @@ -37988,7 +37988,7 @@
1.5134 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5135 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5136 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5137 - <pElem>../../jdk/makefiles</pElem>
1.5138 + <pElem>../../jdk/make</pElem>
1.5139 </incDir>
1.5140 <preprocessorList>
1.5141 <Elem>THIS_FILE="UnixAsynchronousSocketChannelImpl.c"</Elem>
1.5142 @@ -38037,7 +38037,7 @@
1.5143 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5144 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5145 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5146 - <pElem>../../jdk/makefiles</pElem>
1.5147 + <pElem>../../jdk/make</pElem>
1.5148 </incDir>
1.5149 <preprocessorList>
1.5150 <Elem>ARCH="amd64"</Elem>
1.5151 @@ -38073,7 +38073,7 @@
1.5152 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5153 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5154 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5155 - <pElem>../../jdk/makefiles</pElem>
1.5156 + <pElem>../../jdk/make</pElem>
1.5157 </incDir>
1.5158 <preprocessorList>
1.5159 <Elem>ARCH="amd64"</Elem>
1.5160 @@ -38110,7 +38110,7 @@
1.5161 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5162 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5163 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5164 - <pElem>../../jdk/makefiles</pElem>
1.5165 + <pElem>../../jdk/make</pElem>
1.5166 </incDir>
1.5167 <preprocessorList>
1.5168 <Elem>ARCH="amd64"</Elem>
1.5169 @@ -38147,7 +38147,7 @@
1.5170 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5171 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5172 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5173 - <pElem>../../jdk/makefiles</pElem>
1.5174 + <pElem>../../jdk/make</pElem>
1.5175 </incDir>
1.5176 <preprocessorList>
1.5177 <Elem>ARCH="amd64"</Elem>
1.5178 @@ -38184,7 +38184,7 @@
1.5179 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5180 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5181 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5182 - <pElem>../../jdk/makefiles</pElem>
1.5183 + <pElem>../../jdk/make</pElem>
1.5184 </incDir>
1.5185 <preprocessorList>
1.5186 <Elem>ARCH="amd64"</Elem>
1.5187 @@ -38210,7 +38210,7 @@
1.5188 flavor2="0">
1.5189 <cTool>
1.5190 <incDir>
1.5191 - <pElem>../../jdk/makefiles</pElem>
1.5192 + <pElem>../../jdk/make</pElem>
1.5193 </incDir>
1.5194 <preprocessorList>
1.5195 <Elem>THIS_FILE="genSolarisConstants.c"</Elem>
1.5196 @@ -38223,7 +38223,7 @@
1.5197 flavor2="0">
1.5198 <cTool>
1.5199 <incDir>
1.5200 - <pElem>../../jdk/makefiles</pElem>
1.5201 + <pElem>../../jdk/make</pElem>
1.5202 </incDir>
1.5203 <preprocessorList>
1.5204 <Elem>ARCH="amd64"</Elem>
1.5205 @@ -39157,7 +39157,7 @@
1.5206 <folder path="$SRC/jdk/make">
1.5207 <cTool>
1.5208 <incDir>
1.5209 - <pElem>../../jdk/makefiles</pElem>
1.5210 + <pElem>../../jdk/make</pElem>
1.5211 </incDir>
1.5212 </cTool>
1.5213 </folder>
1.5214 @@ -39192,7 +39192,7 @@
1.5215 <pElem>../../jdk/src/share/back</pElem>
1.5216 <pElem>../../jdk/src/solaris/back</pElem>
1.5217 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
1.5218 - <pElem>../../jdk/makefiles</pElem>
1.5219 + <pElem>../../jdk/make</pElem>
1.5220 </incDir>
1.5221 <preprocessorList>
1.5222 <Elem>ARCH="amd64"</Elem>
1.5223 @@ -39278,7 +39278,7 @@
1.5224 <pElem>../../jdk/src/solaris/native/common</pElem>
1.5225 <pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
1.5226 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.5227 - <pElem>../../jdk/makefiles</pElem>
1.5228 + <pElem>../../jdk/make</pElem>
1.5229 </incDir>
1.5230 </ccTool>
1.5231 </folder>
1.5232 @@ -39288,7 +39288,7 @@
1.5233 <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
1.5234 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.5235 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.5236 - <pElem>../../jdk/makefiles</pElem>
1.5237 + <pElem>../../jdk/make</pElem>
1.5238 </incDir>
1.5239 </cTool>
1.5240 </folder>
1.5241 @@ -39297,7 +39297,7 @@
1.5242 <incDir>
1.5243 <pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
1.5244 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.5245 - <pElem>../../jdk/makefiles</pElem>
1.5246 + <pElem>../../jdk/make</pElem>
1.5247 </incDir>
1.5248 <preprocessorList>
1.5249 <Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
1.5250 @@ -39309,7 +39309,7 @@
1.5251 <incDir>
1.5252 <pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
1.5253 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.5254 - <pElem>../../jdk/makefiles</pElem>
1.5255 + <pElem>../../jdk/make</pElem>
1.5256 </incDir>
1.5257 <preprocessorList>
1.5258 <Elem>THIS_FILE="gctest.c"</Elem>
1.5259 @@ -39322,7 +39322,7 @@
1.5260 <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
1.5261 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.5262 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.5263 - <pElem>../../jdk/makefiles</pElem>
1.5264 + <pElem>../../jdk/make</pElem>
1.5265 </incDir>
1.5266 <preprocessorList>
1.5267 <Elem>THIS_FILE="heapTracker.c"</Elem>
1.5268 @@ -39334,7 +39334,7 @@
1.5269 <incDir>
1.5270 <pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
1.5271 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.5272 - <pElem>../../jdk/makefiles</pElem>
1.5273 + <pElem>../../jdk/make</pElem>
1.5274 </incDir>
1.5275 <preprocessorList>
1.5276 <Elem>THIS_FILE="heapViewer.c"</Elem>
1.5277 @@ -39349,7 +39349,7 @@
1.5278 <pElem>../../jdk/src/share/npt</pElem>
1.5279 <pElem>../../jdk/src/solaris/npt</pElem>
1.5280 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.5281 - <pElem>../../jdk/makefiles</pElem>
1.5282 + <pElem>../../jdk/make</pElem>
1.5283 </incDir>
1.5284 <preprocessorList>
1.5285 <Elem>THIS_FILE="debug_malloc.c"</Elem>
1.5286 @@ -39364,7 +39364,7 @@
1.5287 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.5288 <pElem>../../jdk/src/share/npt</pElem>
1.5289 <pElem>../../jdk/src/solaris/npt</pElem>
1.5290 - <pElem>../../jdk/makefiles</pElem>
1.5291 + <pElem>../../jdk/make</pElem>
1.5292 </incDir>
1.5293 <preprocessorList>
1.5294 <Elem>THIS_FILE="java_crw_demo.c"</Elem>
1.5295 @@ -39377,7 +39377,7 @@
1.5296 <pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
1.5297 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.5298 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.5299 - <pElem>../../jdk/makefiles</pElem>
1.5300 + <pElem>../../jdk/make</pElem>
1.5301 </incDir>
1.5302 <preprocessorList>
1.5303 <Elem>THIS_FILE="minst.c"</Elem>
1.5304 @@ -39390,7 +39390,7 @@
1.5305 <pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
1.5306 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.5307 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.5308 - <pElem>../../jdk/makefiles</pElem>
1.5309 + <pElem>../../jdk/make</pElem>
1.5310 </incDir>
1.5311 <preprocessorList>
1.5312 <Elem>THIS_FILE="mtrace.c"</Elem>
1.5313 @@ -39402,7 +39402,7 @@
1.5314 <incDir>
1.5315 <pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
1.5316 <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
1.5317 - <pElem>../../jdk/makefiles</pElem>
1.5318 + <pElem>../../jdk/make</pElem>
1.5319 </incDir>
1.5320 <preprocessorList>
1.5321 <Elem>THIS_FILE="versionCheck.c"</Elem>
1.5322 @@ -39422,7 +39422,7 @@
1.5323 <pElem>../../jdk/src/share/instrument</pElem>
1.5324 <pElem>../../jdk/src/solaris/instrument</pElem>
1.5325 <pElem>../../jdk/src/share/bin</pElem>
1.5326 - <pElem>../../jdk/makefiles</pElem>
1.5327 + <pElem>../../jdk/make</pElem>
1.5328 </incDir>
1.5329 <preprocessorList>
1.5330 <Elem>ARCH="amd64"</Elem>
1.5331 @@ -39467,7 +39467,7 @@
1.5332 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.5333 <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
1.5334 <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
1.5335 - <pElem>../../jdk/makefiles</pElem>
1.5336 + <pElem>../../jdk/make</pElem>
1.5337 </incDir>
1.5338 <preprocessorList>
1.5339 <Elem>ARCH="amd64"</Elem>
1.5340 @@ -39571,7 +39571,7 @@
1.5341 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.5342 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.5343 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.5344 - <pElem>../../jdk/makefiles</pElem>
1.5345 + <pElem>../../jdk/make</pElem>
1.5346 </incDir>
1.5347 <preprocessorList>
1.5348 <Elem>ARCHPROPNAME="amd64"</Elem>
1.5349 @@ -39602,7 +39602,7 @@
1.5350 <cTool>
1.5351 <incDir>
1.5352 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.5353 - <pElem>../../jdk/makefiles</pElem>
1.5354 + <pElem>../../jdk/make</pElem>
1.5355 </incDir>
1.5356 </cTool>
1.5357 </folder>
1.5358 @@ -39624,7 +39624,7 @@
1.5359 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.5360 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.5361 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.5362 - <pElem>../../jdk/makefiles</pElem>
1.5363 + <pElem>../../jdk/make</pElem>
1.5364 </incDir>
1.5365 <preprocessorList>
1.5366 <Elem>ARCHPROPNAME="amd64"</Elem>
1.5367 @@ -39654,7 +39654,7 @@
1.5368 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.5369 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.5370 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.5371 - <pElem>../../jdk/makefiles</pElem>
1.5372 + <pElem>../../jdk/make</pElem>
1.5373 </incDir>
1.5374 <preprocessorList>
1.5375 <Elem>ARCHPROPNAME="amd64"</Elem>
1.5376 @@ -39681,7 +39681,7 @@
1.5377 <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
1.5378 <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
1.5379 <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
1.5380 - <pElem>../../jdk/makefiles</pElem>
1.5381 + <pElem>../../jdk/make</pElem>
1.5382 </incDir>
1.5383 <preprocessorList>
1.5384 <Elem>THIS_FILE="DatagramPacket.c"</Elem>
1.5385 @@ -39713,7 +39713,7 @@
1.5386 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.5387 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.5388 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.5389 - <pElem>../../jdk/makefiles</pElem>
1.5390 + <pElem>../../jdk/make</pElem>
1.5391 </incDir>
1.5392 <preprocessorList>
1.5393 <Elem>ARCHPROPNAME="amd64"</Elem>
1.5394 @@ -39750,7 +39750,7 @@
1.5395 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.5396 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.5397 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.5398 - <pElem>../../jdk/makefiles</pElem>
1.5399 + <pElem>../../jdk/make</pElem>
1.5400 </incDir>
1.5401 <preprocessorList>
1.5402 <Elem>ARCHPROPNAME="amd64"</Elem>
1.5403 @@ -39794,7 +39794,7 @@
1.5404 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.5405 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.5406 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.5407 - <pElem>../../jdk/makefiles</pElem>
1.5408 + <pElem>../../jdk/make</pElem>
1.5409 </incDir>
1.5410 <preprocessorList>
1.5411 <Elem>ARCHPROPNAME="amd64"</Elem>
1.5412 @@ -39830,7 +39830,7 @@
1.5413 <pElem>../../jdk/src/share/native/common</pElem>
1.5414 <pElem>../../jdk/src/solaris/native/common</pElem>
1.5415 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.5416 - <pElem>../../jdk/makefiles</pElem>
1.5417 + <pElem>../../jdk/make</pElem>
1.5418 </incDir>
1.5419 <preprocessorList>
1.5420 <Elem>PNG_NO_MMX_CODE</Elem>
1.5421 @@ -39905,7 +39905,7 @@
1.5422 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.5423 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.5424 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.5425 - <pElem>../../jdk/makefiles</pElem>
1.5426 + <pElem>../../jdk/make</pElem>
1.5427 </incDir>
1.5428 <preprocessorList>
1.5429 <Elem>FUNCPROTO=15</Elem>
1.5430 @@ -39935,7 +39935,7 @@
1.5431 <pElem>../../jdk/src/share/native/common</pElem>
1.5432 <pElem>../../jdk/src/solaris/native/common</pElem>
1.5433 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.5434 - <pElem>../../jdk/makefiles</pElem>
1.5435 + <pElem>../../jdk/make</pElem>
1.5436 </incDir>
1.5437 <preprocessorList>
1.5438 <Elem>PNG_NO_MMX_CODE</Elem>
1.5439 @@ -39978,7 +39978,7 @@
1.5440 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.5441 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.5442 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.5443 - <pElem>../../jdk/makefiles</pElem>
1.5444 + <pElem>../../jdk/make</pElem>
1.5445 </incDir>
1.5446 <preprocessorList>
1.5447 <Elem>INTERNAL_BUILD</Elem>
1.5448 @@ -40013,7 +40013,7 @@
1.5449 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.5450 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.5451 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.5452 - <pElem>../../jdk/makefiles</pElem>
1.5453 + <pElem>../../jdk/make</pElem>
1.5454 </incDir>
1.5455 <preprocessorList>
1.5456 <Elem>INTERNAL_BUILD</Elem>
1.5457 @@ -40048,7 +40048,7 @@
1.5458 <pElem>../../jdk/src/share/native/common</pElem>
1.5459 <pElem>../../jdk/src/solaris/native/common</pElem>
1.5460 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.5461 - <pElem>../../jdk/makefiles</pElem>
1.5462 + <pElem>../../jdk/make</pElem>
1.5463 </incDir>
1.5464 <preprocessorList>
1.5465 <Elem>PNG_NO_MMX_CODE</Elem>
1.5466 @@ -40094,7 +40094,7 @@
1.5467 <pElem>../../jdk/src/share/native/common</pElem>
1.5468 <pElem>../../jdk/src/solaris/native/common</pElem>
1.5469 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.5470 - <pElem>../../jdk/makefiles</pElem>
1.5471 + <pElem>../../jdk/make</pElem>
1.5472 </incDir>
1.5473 <preprocessorList>
1.5474 <Elem>PNG_NO_MMX_CODE</Elem>
1.5475 @@ -40130,7 +40130,7 @@
1.5476 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.5477 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.5478 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.5479 - <pElem>../../jdk/makefiles</pElem>
1.5480 + <pElem>../../jdk/make</pElem>
1.5481 </incDir>
1.5482 <preprocessorList>
1.5483 <Elem>FUNCPROTO=15</Elem>
1.5484 @@ -40183,7 +40183,7 @@
1.5485 <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
1.5486 <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
1.5487 <pElem>../../jdk/src/share/native/sun/java2d</pElem>
1.5488 - <pElem>../../jdk/makefiles</pElem>
1.5489 + <pElem>../../jdk/make</pElem>
1.5490 </incDir>
1.5491 <preprocessorList>
1.5492 <Elem>HEADLESS</Elem>
1.5493 @@ -40225,7 +40225,7 @@
1.5494 <incDir>
1.5495 <pElem>../../jdk/src/share/native/sun/java2d</pElem>
1.5496 <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
1.5497 - <pElem>../../jdk/makefiles</pElem>
1.5498 + <pElem>../../jdk/make</pElem>
1.5499 </incDir>
1.5500 </cTool>
1.5501 </folder>
1.5502 @@ -40248,7 +40248,7 @@
1.5503 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.5504 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.5505 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.5506 - <pElem>../../jdk/makefiles</pElem>
1.5507 + <pElem>../../jdk/make</pElem>
1.5508 </incDir>
1.5509 <preprocessorList>
1.5510 <Elem>INTERNAL_BUILD</Elem>
1.5511 @@ -40277,7 +40277,7 @@
1.5512 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.5513 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.5514 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.5515 - <pElem>../../jdk/makefiles</pElem>
1.5516 + <pElem>../../jdk/make</pElem>
1.5517 </incDir>
1.5518 <preprocessorList>
1.5519 <Elem>FUNCPROTO=15</Elem>
1.5520 @@ -40309,7 +40309,7 @@
1.5521 <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
1.5522 <pElem>../../jdk/src/share/native/sun/font</pElem>
1.5523 <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
1.5524 - <pElem>../../jdk/makefiles</pElem>
1.5525 + <pElem>../../jdk/make</pElem>
1.5526 </incDir>
1.5527 <preprocessorList>
1.5528 <Elem>INTERNAL_BUILD</Elem>
1.5529 @@ -40330,7 +40330,7 @@
1.5530 <pElem>../../jdk/src/solaris/native/common</pElem>
1.5531 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.5532 <pElem>../../jdk/src/share/native/sun/management</pElem>
1.5533 - <pElem>../../jdk/makefiles</pElem>
1.5534 + <pElem>../../jdk/make</pElem>
1.5535 </incDir>
1.5536 <preprocessorList>
1.5537 <Elem>ARCH="amd64"</Elem>
1.5538 @@ -40375,7 +40375,7 @@
1.5539 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.5540 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.5541 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.5542 - <pElem>../../jdk/makefiles</pElem>
1.5543 + <pElem>../../jdk/make</pElem>
1.5544 </incDir>
1.5545 <preprocessorList>
1.5546 <Elem>ARCH="amd64"</Elem>
1.5547 @@ -40403,7 +40403,7 @@
1.5548 <folder path="$SRC/jdk/src/share/native/sun/nio">
1.5549 <cTool>
1.5550 <incDir>
1.5551 - <pElem>../../jdk/makefiles</pElem>
1.5552 + <pElem>../../jdk/make</pElem>
1.5553 </incDir>
1.5554 <preprocessorList>
1.5555 <Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
1.5556 @@ -40435,7 +40435,7 @@
1.5557 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.5558 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.5559 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.5560 - <pElem>../../jdk/makefiles</pElem>
1.5561 + <pElem>../../jdk/make</pElem>
1.5562 </incDir>
1.5563 <preprocessorList>
1.5564 <Elem>ARCH="amd64"</Elem>
1.5565 @@ -40492,7 +40492,7 @@
1.5566 <incDir>
1.5567 <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
1.5568 <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
1.5569 - <pElem>../../jdk/makefiles</pElem>
1.5570 + <pElem>../../jdk/make</pElem>
1.5571 </incDir>
1.5572 <preprocessorList>
1.5573 <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
1.5574 @@ -40504,7 +40504,7 @@
1.5575 <incDir>
1.5576 <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
1.5577 <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
1.5578 - <pElem>../../jdk/makefiles</pElem>
1.5579 + <pElem>../../jdk/make</pElem>
1.5580 </incDir>
1.5581 <preprocessorList>
1.5582 <Elem>MP_API_COMPATIBLE</Elem>
1.5583 @@ -40517,7 +40517,7 @@
1.5584 <incDir>
1.5585 <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
1.5586 <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
1.5587 - <pElem>../../jdk/makefiles</pElem>
1.5588 + <pElem>../../jdk/make</pElem>
1.5589 </incDir>
1.5590 <preprocessorList>
1.5591 <Elem>THIS_FILE="GSSLibStub.c"</Elem>
1.5592 @@ -40531,7 +40531,7 @@
1.5593 <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
1.5594 <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
1.5595 <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
1.5596 - <pElem>../../jdk/makefiles</pElem>
1.5597 + <pElem>../../jdk/make</pElem>
1.5598 </incDir>
1.5599 <preprocessorList>
1.5600 <Elem>THIS_FILE="p11_convert.c"</Elem>
1.5601 @@ -40544,7 +40544,7 @@
1.5602 <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
1.5603 <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
1.5604 <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
1.5605 - <pElem>../../jdk/makefiles</pElem>
1.5606 + <pElem>../../jdk/make</pElem>
1.5607 </incDir>
1.5608 <preprocessorList>
1.5609 <Elem>THIS_FILE="pcsc.c"</Elem>
1.5610 @@ -40563,7 +40563,7 @@
1.5611 <pElem>../../jdk/src/solaris/native/common</pElem>
1.5612 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.5613 <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
1.5614 - <pElem>../../jdk/makefiles</pElem>
1.5615 + <pElem>../../jdk/make</pElem>
1.5616 </incDir>
1.5617 <preprocessorList>
1.5618 <Elem>ARCH="amd64"</Elem>
1.5619 @@ -40595,7 +40595,7 @@
1.5620 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.5621 <pElem>../../jdk/src/share/npt</pElem>
1.5622 <pElem>../../jdk/src/solaris/npt</pElem>
1.5623 - <pElem>../../jdk/makefiles</pElem>
1.5624 + <pElem>../../jdk/make</pElem>
1.5625 </incDir>
1.5626 <preprocessorList>
1.5627 <Elem>ARCH="amd64"</Elem>
1.5628 @@ -40629,7 +40629,7 @@
1.5629 <pElem>../../jdk/src/solaris/transport/socket</pElem>
1.5630 <pElem>../../jdk/src/share/back/export</pElem>
1.5631 <pElem>../../jdk/src/share/back</pElem>
1.5632 - <pElem>../../jdk/makefiles</pElem>
1.5633 + <pElem>../../jdk/make</pElem>
1.5634 </incDir>
1.5635 <preprocessorList>
1.5636 <Elem>ARCH="amd64"</Elem>
1.5637 @@ -40674,7 +40674,7 @@
1.5638 <pElem>../../jdk/src/share/back</pElem>
1.5639 <pElem>../../jdk/src/solaris/back</pElem>
1.5640 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
1.5641 - <pElem>../../jdk/makefiles</pElem>
1.5642 + <pElem>../../jdk/make</pElem>
1.5643 </incDir>
1.5644 <preprocessorList>
1.5645 <Elem>ARCH="amd64"</Elem>
1.5646 @@ -40707,7 +40707,7 @@
1.5647 <pElem>../../jdk/src/share/bin</pElem>
1.5648 <pElem>../../jdk/src/solaris/bin</pElem>
1.5649 <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
1.5650 - <pElem>../../jdk/makefiles</pElem>
1.5651 + <pElem>../../jdk/make</pElem>
1.5652 </incDir>
1.5653 <preprocessorList>
1.5654 <Elem>ARCH="amd64"</Elem>
1.5655 @@ -40762,7 +40762,7 @@
1.5656 <cTool>
1.5657 <incDir>
1.5658 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/democlasses/jni/Poller</pElem>
1.5659 - <pElem>../../jdk/makefiles</pElem>
1.5660 + <pElem>../../jdk/make</pElem>
1.5661 </incDir>
1.5662 </cTool>
1.5663 </folder>
1.5664 @@ -40774,7 +40774,7 @@
1.5665 <pElem>../../jdk/src/share/npt</pElem>
1.5666 <pElem>../../jdk/src/solaris/npt</pElem>
1.5667 <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
1.5668 - <pElem>../../jdk/makefiles</pElem>
1.5669 + <pElem>../../jdk/make</pElem>
1.5670 </incDir>
1.5671 <preprocessorList>
1.5672 <Elem>THIS_FILE="hprof_md.c"</Elem>
1.5673 @@ -40794,7 +40794,7 @@
1.5674 <pElem>../../jdk/src/share/instrument</pElem>
1.5675 <pElem>../../jdk/src/solaris/instrument</pElem>
1.5676 <pElem>../../jdk/src/share/bin</pElem>
1.5677 - <pElem>../../jdk/makefiles</pElem>
1.5678 + <pElem>../../jdk/make</pElem>
1.5679 </incDir>
1.5680 <preprocessorList>
1.5681 <Elem>ARCH="amd64"</Elem>
1.5682 @@ -40854,7 +40854,7 @@
1.5683 <cTool>
1.5684 <incDir>
1.5685 <pElem>../../jdk/src/share/native/sun/management</pElem>
1.5686 - <pElem>../../jdk/makefiles</pElem>
1.5687 + <pElem>../../jdk/make</pElem>
1.5688 </incDir>
1.5689 </cTool>
1.5690 </folder>
1.5691 @@ -40863,7 +40863,7 @@
1.5692 <incDir>
1.5693 <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
1.5694 <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
1.5695 - <pElem>../../jdk/makefiles</pElem>
1.5696 + <pElem>../../jdk/make</pElem>
1.5697 </incDir>
1.5698 <preprocessorList>
1.5699 <Elem>EXTRA_SOUND_JNI_LIBS=""</Elem>
1.5700 @@ -40878,7 +40878,7 @@
1.5701 <folder path="$SRC/jdk/src/solaris/native/com/sun/security">
1.5702 <cTool>
1.5703 <incDir>
1.5704 - <pElem>../../jdk/makefiles</pElem>
1.5705 + <pElem>../../jdk/make</pElem>
1.5706 </incDir>
1.5707 <preprocessorList>
1.5708 <Elem>THIS_FILE="Solaris.c"</Elem>
1.5709 @@ -40910,7 +40910,7 @@
1.5710 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.5711 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.5712 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.5713 - <pElem>../../jdk/makefiles</pElem>
1.5714 + <pElem>../../jdk/make</pElem>
1.5715 </incDir>
1.5716 <preprocessorList>
1.5717 <Elem>ARCH="amd64"</Elem>
1.5718 @@ -40982,7 +40982,7 @@
1.5719 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.5720 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.5721 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.5722 - <pElem>../../jdk/makefiles</pElem>
1.5723 + <pElem>../../jdk/make</pElem>
1.5724 </incDir>
1.5725 <preprocessorList>
1.5726 <Elem>ARCHPROPNAME="amd64"</Elem>
1.5727 @@ -41011,7 +41011,7 @@
1.5728 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.5729 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.5730 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.5731 - <pElem>../../jdk/makefiles</pElem>
1.5732 + <pElem>../../jdk/make</pElem>
1.5733 </incDir>
1.5734 <preprocessorList>
1.5735 <Elem>ARCHPROPNAME="amd64"</Elem>
1.5736 @@ -41031,7 +41031,7 @@
1.5737 <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
1.5738 <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
1.5739 <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
1.5740 - <pElem>../../jdk/makefiles</pElem>
1.5741 + <pElem>../../jdk/make</pElem>
1.5742 </incDir>
1.5743 <preprocessorList>
1.5744 <Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
1.5745 @@ -41045,7 +41045,7 @@
1.5746 <pElem>../../jdk/src/share/native/java/io</pElem>
1.5747 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5748 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5749 - <pElem>../../jdk/makefiles</pElem>
1.5750 + <pElem>../../jdk/make</pElem>
1.5751 </incDir>
1.5752 <preprocessorList>
1.5753 <Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
1.5754 @@ -41070,7 +41070,7 @@
1.5755 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.5756 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.5757 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.5758 - <pElem>../../jdk/makefiles</pElem>
1.5759 + <pElem>../../jdk/make</pElem>
1.5760 </incDir>
1.5761 <preprocessorList>
1.5762 <Elem>ARCHPROPNAME="amd64"</Elem>
1.5763 @@ -41126,7 +41126,7 @@
1.5764 <pElem>../../jdk/src/share/native/common</pElem>
1.5765 <pElem>../../jdk/src/solaris/native/common</pElem>
1.5766 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.5767 - <pElem>../../jdk/makefiles</pElem>
1.5768 + <pElem>../../jdk/make</pElem>
1.5769 </incDir>
1.5770 <preprocessorList>
1.5771 <Elem>PNG_NO_MMX_CODE</Elem>
1.5772 @@ -41155,7 +41155,7 @@
1.5773 <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
1.5774 <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
1.5775 <pElem>../../jdk/src/share/native/sun/java2d</pElem>
1.5776 - <pElem>../../jdk/makefiles</pElem>
1.5777 + <pElem>../../jdk/make</pElem>
1.5778 </incDir>
1.5779 <preprocessorList>
1.5780 <Elem>ARCH="amd64"</Elem>
1.5781 @@ -41203,7 +41203,7 @@
1.5782 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.5783 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.5784 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.5785 - <pElem>../../jdk/makefiles</pElem>
1.5786 + <pElem>../../jdk/make</pElem>
1.5787 </incDir>
1.5788 <preprocessorList>
1.5789 <Elem>ARCH="amd64"</Elem>
1.5790 @@ -41247,7 +41247,7 @@
1.5791 <pElem>../../jdk/src/solaris/native/common</pElem>
1.5792 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.5793 <pElem>../../jdk/src/share/native/sun/management</pElem>
1.5794 - <pElem>../../jdk/makefiles</pElem>
1.5795 + <pElem>../../jdk/make</pElem>
1.5796 </incDir>
1.5797 <preprocessorList>
1.5798 <Elem>ARCH="amd64"</Elem>
1.5799 @@ -41282,7 +41282,7 @@
1.5800 <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
1.5801 <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
1.5802 <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
1.5803 - <pElem>../../jdk/makefiles</pElem>
1.5804 + <pElem>../../jdk/make</pElem>
1.5805 </incDir>
1.5806 <preprocessorList>
1.5807 <Elem>ARCH="amd64"</Elem>
1.5808 @@ -41359,7 +41359,7 @@
1.5809 <pElem>../../jdk/src/share/native/java/net</pElem>
1.5810 <pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
1.5811 <pElem>../../jdk/src/solaris/native/java/net</pElem>
1.5812 - <pElem>../../jdk/makefiles</pElem>
1.5813 + <pElem>../../jdk/make</pElem>
1.5814 </incDir>
1.5815 </cTool>
1.5816 </folder>
1.5817 @@ -41404,7 +41404,7 @@
1.5818 <incDir>
1.5819 <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
1.5820 <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
1.5821 - <pElem>../../jdk/makefiles</pElem>
1.5822 + <pElem>../../jdk/make</pElem>
1.5823 </incDir>
1.5824 </cTool>
1.5825 </folder>
1.5826 @@ -41415,7 +41415,7 @@
1.5827 <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
1.5828 <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
1.5829 <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
1.5830 - <pElem>../../jdk/makefiles</pElem>
1.5831 + <pElem>../../jdk/make</pElem>
1.5832 </incDir>
1.5833 <preprocessorList>
1.5834 <Elem>THIS_FILE="p11_md.c"</Elem>
1.5835 @@ -41428,7 +41428,7 @@
1.5836 <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
1.5837 <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
1.5838 <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
1.5839 - <pElem>../../jdk/makefiles</pElem>
1.5840 + <pElem>../../jdk/make</pElem>
1.5841 </incDir>
1.5842 <preprocessorList>
1.5843 <Elem>THIS_FILE="pcsc_md.c"</Elem>
1.5844 @@ -41446,7 +41446,7 @@
1.5845 <pElem>../../jdk/src/share/native/common</pElem>
1.5846 <pElem>../../jdk/src/solaris/native/common</pElem>
1.5847 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.5848 - <pElem>../../jdk/makefiles</pElem>
1.5849 + <pElem>../../jdk/make</pElem>
1.5850 </incDir>
1.5851 <preprocessorList>
1.5852 <Elem>ARCH="amd64"</Elem>
1.5853 @@ -41477,7 +41477,7 @@
1.5854 <pElem>../../jdk/src/solaris/native/common</pElem>
1.5855 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.5856 <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
1.5857 - <pElem>../../jdk/makefiles</pElem>
1.5858 + <pElem>../../jdk/make</pElem>
1.5859 </incDir>
1.5860 <preprocessorList>
1.5861 <Elem>ARCH="amd64"</Elem>
1.5862 @@ -41522,7 +41522,7 @@
1.5863 <pElem>../../jdk/src/solaris/native/java/util</pElem>
1.5864 <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
1.5865 <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
1.5866 - <pElem>../../jdk/makefiles</pElem>
1.5867 + <pElem>../../jdk/make</pElem>
1.5868 </incDir>
1.5869 <preprocessorList>
1.5870 <Elem>ARCH="amd64"</Elem>
1.5871 @@ -41573,7 +41573,7 @@
1.5872 <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
1.5873 <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
1.5874 <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
1.5875 - <pElem>../../jdk/makefiles</pElem>
1.5876 + <pElem>../../jdk/make</pElem>
1.5877 </incDir>
1.5878 <preprocessorList>
1.5879 <Elem>ARCH="amd64"</Elem>
1.5880 @@ -41611,7 +41611,7 @@
1.5881 <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
1.5882 <pElem>../../jdk/src/share/npt</pElem>
1.5883 <pElem>../../jdk/src/solaris/npt</pElem>
1.5884 - <pElem>../../jdk/makefiles</pElem>
1.5885 + <pElem>../../jdk/make</pElem>
1.5886 </incDir>
1.5887 <preprocessorList>
1.5888 <Elem>ARCH="amd64"</Elem>
1.5889 @@ -41645,7 +41645,7 @@
1.5890 <pElem>../../jdk/src/solaris/transport/socket</pElem>
1.5891 <pElem>../../jdk/src/share/back/export</pElem>
1.5892 <pElem>../../jdk/src/share/back</pElem>
1.5893 - <pElem>../../jdk/makefiles</pElem>
1.5894 + <pElem>../../jdk/make</pElem>
1.5895 </incDir>
1.5896 <preprocessorList>
1.5897 <Elem>ARCH="amd64"</Elem>
