Mercurial Mercurial > jdk-sandbox / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
common/nb_native/nbproject/configurations.xml
changeset 21759 e24e22311718
parent 16985 c2db5ccfba28
child 33926 3a19edba4808 
--- a/common/nb_native/nbproject/configurations.xml	Thu Nov 07 08:16:05 2013 -0800
+++ b/common/nb_native/nbproject/configurations.xml	Thu Nov 14 10:53:23 2013 +0100
@@ -4987,7 +4987,7 @@
             <pElem>../../jdk/src/share/back</pElem>
             <pElem>../../jdk/src/solaris/back</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -5064,7 +5064,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </ccTool>
       </folder>
@@ -5074,7 +5074,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -5083,7 +5083,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
@@ -5095,7 +5095,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="gctest.c"</Elem>
@@ -5108,7 +5108,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="heapTracker.c"</Elem>
@@ -5120,7 +5120,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="heapViewer.c"</Elem>
@@ -5135,7 +5135,7 @@
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="debug_malloc.c"</Elem>
@@ -5150,7 +5150,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="java_crw_demo.c"</Elem>
@@ -5163,7 +5163,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="minst.c"</Elem>
@@ -5176,7 +5176,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="mtrace.c"</Elem>
@@ -5188,7 +5188,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="versionCheck.c"</Elem>
@@ -5208,7 +5208,7 @@
             <pElem>../../jdk/src/share/instrument</pElem>
             <pElem>../../jdk/src/solaris/instrument</pElem>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -5250,7 +5250,7 @@
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
             <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -5342,7 +5342,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5373,7 +5373,7 @@
         <cTool>
           <incDir>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -5395,7 +5395,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5425,7 +5425,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5452,7 +5452,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DatagramPacket.c"</Elem>
@@ -5484,7 +5484,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5521,7 +5521,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5565,7 +5565,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5601,7 +5601,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -5673,7 +5673,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -5702,7 +5702,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -5745,7 +5745,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -5781,7 +5781,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -5817,7 +5817,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -5864,7 +5864,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -5900,7 +5900,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -5949,7 +5949,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -5988,7 +5988,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -6011,7 +6011,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -6041,7 +6041,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -6072,7 +6072,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -6094,7 +6094,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -6136,7 +6136,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -6161,7 +6161,7 @@
       <folder path="$SRC/jdk/src/share/native/sun/nio">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
@@ -6193,7 +6193,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -6244,7 +6244,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
             <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
@@ -6256,7 +6256,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
             <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MP_API_COMPATIBLE</Elem>
@@ -6269,7 +6269,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="GSSLibStub.c"</Elem>
@@ -6283,7 +6283,7 @@
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
             <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="p11_convert.c"</Elem>
@@ -6296,7 +6296,7 @@
             <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="pcsc.c"</Elem>
@@ -6315,7 +6315,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -6344,7 +6344,7 @@
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -6375,7 +6375,7 @@
             <pElem>../../jdk/src/solaris/transport/socket</pElem>
             <pElem>../../jdk/src/share/back/export</pElem>
             <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -6427,7 +6427,7 @@
             <pElem>../../jdk/src/share/back</pElem>
             <pElem>../../jdk/src/solaris/back</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>JDWP_LOGGING</Elem>
@@ -6463,7 +6463,7 @@
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="hprof_md.c"</Elem>
@@ -6483,7 +6483,7 @@
             <pElem>../../jdk/src/share/instrument</pElem>
             <pElem>../../jdk/src/solaris/instrument</pElem>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_JPLIS_LOGGING</Elem>
@@ -6515,7 +6515,7 @@
         <cTool>
           <incDir>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -6524,7 +6524,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
             <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>EXTRA_SOUND_JNI_LIBS=" jsoundalsa"</Elem>
@@ -6541,7 +6541,7 @@
       <folder path="$SRC/jdk/src/solaris/native/com/sun/security">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Unix.c"</Elem>
@@ -6573,7 +6573,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -6619,7 +6619,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -6648,7 +6648,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -6668,7 +6668,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
@@ -6682,7 +6682,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
@@ -6707,7 +6707,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -6744,7 +6744,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -6773,7 +6773,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -6808,7 +6808,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -6838,7 +6838,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileSystemImpl.c"</Elem>
@@ -6860,7 +6860,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ResolverConfigurationImpl.c"</Elem>
@@ -6909,7 +6909,7 @@
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -6941,7 +6941,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -6952,7 +6952,7 @@
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
             <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="p11_md.c"</Elem>
@@ -6965,7 +6965,7 @@
             <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="pcsc_md.c"</Elem>
@@ -6983,7 +6983,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="LinuxVirtualMachine.c"</Elem>
@@ -7001,7 +7001,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="jvm_symbols_md.c"</Elem>
@@ -7033,7 +7033,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -7071,7 +7071,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -7095,7 +7095,7 @@
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="utf_md.c"</Elem>
@@ -7116,7 +7116,7 @@
             <pElem>../../jdk/src/solaris/transport/socket</pElem>
             <pElem>../../jdk/src/share/back/export</pElem>
             <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="socket_md.c"</Elem>
@@ -10455,7 +10455,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </item>
@@ -10466,7 +10466,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="jli_util.c"</Elem>
@@ -10479,7 +10479,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/linux/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>EXPAND_CLASSPATH_WILDCARDS</Elem>
@@ -10504,7 +10504,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="parse_manifest.c"</Elem>
@@ -10521,7 +10521,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="splashscreen_stubs.c"</Elem>
@@ -10538,7 +10538,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="version_comp.c"</Elem>
@@ -10552,7 +10552,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="wildcard.c"</Elem>
@@ -10992,7 +10992,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11013,7 +11013,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11035,7 +11035,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11057,7 +11057,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11079,7 +11079,7 @@
             <pElem>../../jdk/src/solaris/javavm/export</pElem>
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="main.cpp"</Elem>
@@ -11099,7 +11099,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11121,7 +11121,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11143,7 +11143,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11307,7 +11307,7 @@
             flavor2="0">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </item>
@@ -11317,7 +11317,7 @@
             flavor2="0">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="check_format.c"</Elem>
@@ -11345,7 +11345,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11378,7 +11378,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11411,7 +11411,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11444,7 +11444,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11477,7 +11477,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11565,7 +11565,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11598,7 +11598,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11631,7 +11631,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11664,7 +11664,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11697,7 +11697,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11730,7 +11730,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11763,7 +11763,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11796,7 +11796,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11829,7 +11829,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11862,7 +11862,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11895,7 +11895,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11928,7 +11928,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11961,7 +11961,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11994,7 +11994,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -12027,7 +12027,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -12060,7 +12060,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -12800,7 +12800,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -12833,7 +12833,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Adler32.c"</Elem>
@@ -12860,7 +12860,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="CRC32.c"</Elem>
@@ -12887,7 +12887,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Deflater.c"</Elem>
@@ -12914,7 +12914,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Inflater.c"</Elem>
@@ -12941,7 +12941,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ZipFile.c"</Elem>
@@ -12968,7 +12968,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="zip_util.c"</Elem>
@@ -13213,7 +13213,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -13253,7 +13253,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -13293,7 +13293,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -13333,7 +13333,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -13388,7 +13388,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -13433,7 +13433,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -13458,7 +13458,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </item>
@@ -13483,7 +13483,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13514,7 +13514,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13545,7 +13545,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13576,7 +13576,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13607,7 +13607,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13638,7 +13638,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13669,7 +13669,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13700,7 +13700,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13731,7 +13731,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13762,7 +13762,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13793,7 +13793,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13824,7 +13824,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13855,7 +13855,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13886,7 +13886,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13917,7 +13917,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13948,7 +13948,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13979,7 +13979,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14010,7 +14010,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14041,7 +14041,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14072,7 +14072,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14103,7 +14103,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14134,7 +14134,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14165,7 +14165,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14196,7 +14196,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14227,7 +14227,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14258,7 +14258,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14289,7 +14289,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14320,7 +14320,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14351,7 +14351,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14382,7 +14382,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14413,7 +14413,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14444,7 +14444,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14475,7 +14475,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14506,7 +14506,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14537,7 +14537,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14568,7 +14568,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14599,7 +14599,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14630,7 +14630,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14661,7 +14661,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14692,7 +14692,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14723,7 +14723,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14747,7 +14747,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="jpegdecoder.c"</Elem>
@@ -14775,7 +14775,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14806,7 +14806,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14837,7 +14837,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -15014,7 +15014,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -15029,7 +15029,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15045,7 +15045,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15061,7 +15061,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15077,7 +15077,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15093,7 +15093,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15109,7 +15109,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15125,7 +15125,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15141,7 +15141,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15157,7 +15157,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15173,7 +15173,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15189,7 +15189,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15205,7 +15205,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15221,7 +15221,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15237,7 +15237,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15253,7 +15253,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15269,7 +15269,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15285,7 +15285,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15301,7 +15301,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15317,7 +15317,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15333,7 +15333,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15349,7 +15349,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15365,7 +15365,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15381,7 +15381,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15397,7 +15397,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15413,7 +15413,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15429,7 +15429,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15445,7 +15445,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15461,7 +15461,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15477,7 +15477,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15493,7 +15493,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15509,7 +15509,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15525,7 +15525,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15541,7 +15541,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15557,7 +15557,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15573,7 +15573,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15589,7 +15589,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15605,7 +15605,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15621,7 +15621,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15637,7 +15637,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15653,7 +15653,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15669,7 +15669,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15685,7 +15685,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15701,7 +15701,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15717,7 +15717,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15733,7 +15733,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15749,7 +15749,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15765,7 +15765,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15781,7 +15781,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15797,7 +15797,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15813,7 +15813,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15829,7 +15829,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15845,7 +15845,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15861,7 +15861,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15877,7 +15877,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15893,7 +15893,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15983,7 +15983,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -16010,7 +16010,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -16045,7 +16045,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -16805,7 +16805,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -16836,7 +16836,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -16869,7 +16869,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -16902,7 +16902,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -18449,7 +18449,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCHNAME="amd64"</Elem>
@@ -18466,7 +18466,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCHNAME="amd64"</Elem>
@@ -18484,7 +18484,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCHNAME="amd64"</Elem>
@@ -18502,7 +18502,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCHNAME="amd64"</Elem>
@@ -18514,7 +18514,7 @@
         <cTool>
           <incDir>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="jexec.c"</Elem>
@@ -18895,7 +18895,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -18934,7 +18934,7 @@
             <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS=true</Elem>
@@ -18971,7 +18971,7 @@
             <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS=true</Elem>
@@ -19010,7 +19010,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19051,7 +19051,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19092,7 +19092,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19133,7 +19133,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19174,7 +19174,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19215,7 +19215,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19256,7 +19256,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19297,7 +19297,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19338,7 +19338,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19378,7 +19378,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19418,7 +19418,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19459,7 +19459,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19500,7 +19500,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19541,7 +19541,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19582,7 +19582,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19623,7 +19623,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19664,7 +19664,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19705,7 +19705,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19746,7 +19746,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19787,7 +19787,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19828,7 +19828,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19869,7 +19869,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19915,7 +19915,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19956,7 +19956,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19997,7 +19997,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -20133,7 +20133,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DatagramChannelImpl.c"</Elem>
@@ -20149,7 +20149,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DatagramDispatcher.c"</Elem>
@@ -20165,7 +20165,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="EPoll.c"</Elem>
@@ -20181,7 +20181,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="EPollArrayWrapper.c"</Elem>
@@ -20197,7 +20197,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="EPollPort.c"</Elem>
@@ -20213,7 +20213,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileChannelImpl.c"</Elem>
@@ -20229,7 +20229,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileDispatcherImpl.c"</Elem>
@@ -20245,7 +20245,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileKey.c"</Elem>
@@ -20261,7 +20261,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="IOUtil.c"</Elem>
@@ -20277,7 +20277,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="InheritedChannel.c"</Elem>
@@ -20293,7 +20293,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="NativeThread.c"</Elem>
@@ -20309,7 +20309,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Net.c"</Elem>
@@ -20325,7 +20325,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="PollArrayWrapper.c"</Elem>
@@ -20341,7 +20341,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ServerSocketChannelImpl.c"</Elem>
@@ -20357,7 +20357,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="SocketChannelImpl.c"</Elem>
@@ -20373,7 +20373,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="SocketDispatcher.c"</Elem>
@@ -20389,7 +20389,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="UnixAsynchronousServerSocketChannelImpl.c"</Elem>
@@ -20405,7 +20405,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="UnixAsynchronousSocketChannelImpl.c"</Elem>
@@ -20454,7 +20454,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </item>
@@ -20475,7 +20475,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="LinuxNativeDispatcher.c"</Elem>
@@ -20499,7 +20499,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="LinuxWatchService.c"</Elem>
@@ -20523,7 +20523,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="MagicFileTypeDetector.c"</Elem>
@@ -20547,7 +20547,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="UnixCopyFile.c"</Elem>
@@ -20571,7 +20571,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="UnixNativeDispatcher.c"</Elem>
@@ -20584,7 +20584,7 @@
             flavor2="0">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="genUnixConstants.c"</Elem>
@@ -21464,7 +21464,7 @@
             <pElem>../../jdk/src/share/back</pElem>
             <pElem>../../jdk/src/solaris/back</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -21541,7 +21541,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </ccTool>
       </folder>
@@ -21551,7 +21551,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -21560,7 +21560,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
@@ -21572,7 +21572,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="gctest.c"</Elem>
@@ -21585,7 +21585,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="heapTracker.c"</Elem>
@@ -21597,7 +21597,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="heapViewer.c"</Elem>
@@ -21612,7 +21612,7 @@
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="debug_malloc.c"</Elem>
@@ -21627,7 +21627,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="java_crw_demo.c"</Elem>
@@ -21640,7 +21640,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="minst.c"</Elem>
@@ -21653,7 +21653,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="mtrace.c"</Elem>
@@ -21665,7 +21665,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="versionCheck.c"</Elem>
@@ -21685,7 +21685,7 @@
             <pElem>../../jdk/src/share/instrument</pElem>
             <pElem>../../jdk/src/solaris/instrument</pElem>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -21727,7 +21727,7 @@
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
             <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -21820,7 +21820,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -21851,7 +21851,7 @@
         <cTool>
           <incDir>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -21873,7 +21873,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -21903,7 +21903,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -21930,7 +21930,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DatagramPacket.c"</Elem>
@@ -21962,7 +21962,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -21999,7 +21999,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -22043,7 +22043,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -22079,7 +22079,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -22151,7 +22151,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22180,7 +22180,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -22223,7 +22223,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22259,7 +22259,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22295,7 +22295,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -22342,7 +22342,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -22378,7 +22378,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22427,7 +22427,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -22466,7 +22466,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -22489,7 +22489,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22519,7 +22519,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22550,7 +22550,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22572,7 +22572,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -22614,7 +22614,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -22639,7 +22639,7 @@
       <folder path="$SRC/jdk/src/share/native/sun/nio">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
@@ -22671,7 +22671,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -22722,7 +22722,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
             <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
@@ -22734,7 +22734,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
             <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MP_API_COMPATIBLE</Elem>
@@ -22747,7 +22747,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="GSSLibStub.c"</Elem>
@@ -22761,7 +22761,7 @@
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
             <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="p11_convert.c"</Elem>
@@ -22774,7 +22774,7 @@
             <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="pcsc.c"</Elem>
@@ -22793,7 +22793,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -22822,7 +22822,7 @@
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -22853,7 +22853,7 @@
             <pElem>../../jdk/src/solaris/transport/socket</pElem>
             <pElem>../../jdk/src/share/back/export</pElem>
             <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -22905,7 +22905,7 @@
             <pElem>../../jdk/src/share/back</pElem>
             <pElem>../../jdk/src/solaris/back</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>JDWP_LOGGING</Elem>
@@ -22941,7 +22941,7 @@
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="hprof_md.c"</Elem>
@@ -22961,7 +22961,7 @@
             <pElem>../../jdk/src/share/instrument</pElem>
             <pElem>../../jdk/src/solaris/instrument</pElem>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_JPLIS_LOGGING</Elem>
@@ -22993,7 +22993,7 @@
         <cTool>
           <incDir>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -23002,7 +23002,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
             <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>EXTRA_SOUND_JNI_LIBS=" jsoundalsa"</Elem>
@@ -23019,7 +23019,7 @@
       <folder path="$SRC/jdk/src/solaris/native/com/sun/security">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Unix.c"</Elem>
@@ -23051,7 +23051,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -23097,7 +23097,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -23126,7 +23126,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -23146,7 +23146,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
@@ -23160,7 +23160,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
@@ -23185,7 +23185,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -23222,7 +23222,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -23251,7 +23251,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -23286,7 +23286,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -23316,7 +23316,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileSystemImpl.c"</Elem>
@@ -23338,7 +23338,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ResolverConfigurationImpl.c"</Elem>
@@ -23387,7 +23387,7 @@
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -23419,7 +23419,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -23430,7 +23430,7 @@
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
             <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="p11_md.c"</Elem>
@@ -23443,7 +23443,7 @@
             <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="pcsc_md.c"</Elem>
@@ -23461,7 +23461,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="LinuxVirtualMachine.c"</Elem>
@@ -23479,7 +23479,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="jvm_symbols_md.c"</Elem>
@@ -23511,7 +23511,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -23549,7 +23549,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -23573,7 +23573,7 @@
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="utf_md.c"</Elem>
@@ -23594,7 +23594,7 @@
             <pElem>../../jdk/src/solaris/transport/socket</pElem>
             <pElem>../../jdk/src/share/back/export</pElem>
             <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="socket_md.c"</Elem>
@@ -28097,7 +28097,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCH32NAME="i386"</Elem>
@@ -28112,7 +28112,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCH32NAME="i386"</Elem>
@@ -28126,7 +28126,7 @@
           <incDir>
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>EXPAND_CLASSPATH_WILDCARDS</Elem>
@@ -28152,7 +28152,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCH32NAME="i386"</Elem>
@@ -28171,7 +28171,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCH32NAME="i386"</Elem>
@@ -28190,7 +28190,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCH32NAME="i386"</Elem>
@@ -28206,7 +28206,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCH32NAME="i386"</Elem>
@@ -28648,7 +28648,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -28669,7 +28669,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -28691,7 +28691,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -28713,7 +28713,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -28735,7 +28735,7 @@
             <pElem>../../jdk/src/solaris/javavm/export</pElem>
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="main.cpp"</Elem>
@@ -28755,7 +28755,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -28777,7 +28777,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -28799,7 +28799,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -28919,7 +28919,7 @@
             flavor2="0">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </item>
@@ -28929,7 +28929,7 @@
             flavor2="0">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="check_format.c"</Elem>
@@ -28957,7 +28957,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -28990,7 +28990,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29023,7 +29023,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29056,7 +29056,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29089,7 +29089,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29177,7 +29177,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29210,7 +29210,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29243,7 +29243,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29276,7 +29276,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29309,7 +29309,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29342,7 +29342,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29375,7 +29375,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29408,7 +29408,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29441,7 +29441,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29474,7 +29474,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29507,7 +29507,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29540,7 +29540,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29573,7 +29573,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29606,7 +29606,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29639,7 +29639,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29672,7 +29672,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -30412,7 +30412,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -30445,7 +30445,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Adler32.c"</Elem>
@@ -30472,7 +30472,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="CRC32.c"</Elem>
@@ -30499,7 +30499,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Deflater.c"</Elem>
@@ -30526,7 +30526,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Inflater.c"</Elem>
@@ -30553,7 +30553,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ZipFile.c"</Elem>
@@ -30580,7 +30580,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="zip_util.c"</Elem>
@@ -30825,7 +30825,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -30864,7 +30864,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -30903,7 +30903,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -30942,7 +30942,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -30996,7 +30996,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -31040,7 +31040,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -31064,7 +31064,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </item>
@@ -31089,7 +31089,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31120,7 +31120,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31151,7 +31151,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31182,7 +31182,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31213,7 +31213,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31244,7 +31244,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31275,7 +31275,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31306,7 +31306,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31337,7 +31337,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31368,7 +31368,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31399,7 +31399,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31430,7 +31430,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31461,7 +31461,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31492,7 +31492,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31523,7 +31523,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31554,7 +31554,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31585,7 +31585,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31616,7 +31616,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31647,7 +31647,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31678,7 +31678,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31709,7 +31709,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31740,7 +31740,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31771,7 +31771,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31802,7 +31802,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31833,7 +31833,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31864,7 +31864,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31895,7 +31895,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31926,7 +31926,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31957,7 +31957,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31988,7 +31988,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32019,7 +32019,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32050,7 +32050,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32081,7 +32081,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32112,7 +32112,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32143,7 +32143,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32174,7 +32174,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32205,7 +32205,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32236,7 +32236,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32267,7 +32267,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32298,7 +32298,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32329,7 +32329,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32353,7 +32353,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="jpegdecoder.c"</Elem>
@@ -32381,7 +32381,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32412,7 +32412,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32443,7 +32443,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32620,7 +32620,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -32635,7 +32635,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32652,7 +32652,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32669,7 +32669,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32686,7 +32686,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32703,7 +32703,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32720,7 +32720,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32737,7 +32737,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32754,7 +32754,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32771,7 +32771,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32788,7 +32788,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32805,7 +32805,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32822,7 +32822,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32839,7 +32839,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32856,7 +32856,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32873,7 +32873,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32890,7 +32890,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32907,7 +32907,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32924,7 +32924,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32941,7 +32941,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32958,7 +32958,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32975,7 +32975,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32992,7 +32992,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33009,7 +33009,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33026,7 +33026,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33043,7 +33043,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33060,7 +33060,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33077,7 +33077,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33094,7 +33094,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33111,7 +33111,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33128,7 +33128,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33145,7 +33145,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33162,7 +33162,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33179,7 +33179,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33196,7 +33196,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33213,7 +33213,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33230,7 +33230,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33247,7 +33247,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33264,7 +33264,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33281,7 +33281,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33298,7 +33298,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33315,7 +33315,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33332,7 +33332,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33349,7 +33349,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33366,7 +33366,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33383,7 +33383,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33400,7 +33400,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33417,7 +33417,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33434,7 +33434,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33451,7 +33451,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33468,7 +33468,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33485,7 +33485,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33502,7 +33502,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33519,7 +33519,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33536,7 +33536,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33553,7 +33553,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33644,7 +33644,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -33672,7 +33672,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -33707,7 +33707,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -34467,7 +34467,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -34498,7 +34498,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -34530,7 +34530,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -34562,7 +34562,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -36472,7 +36472,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -36512,7 +36512,7 @@
             <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS=true</Elem>
@@ -36549,7 +36549,7 @@
             <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS=true</Elem>
@@ -36588,7 +36588,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -36630,7 +36630,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -36672,7 +36672,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -36714,7 +36714,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -36756,7 +36756,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -36798,7 +36798,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -36840,7 +36840,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -36882,7 +36882,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -36924,7 +36924,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -36963,7 +36963,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -37002,7 +37002,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37044,7 +37044,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37086,7 +37086,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37128,7 +37128,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37170,7 +37170,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37212,7 +37212,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37254,7 +37254,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37296,7 +37296,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37338,7 +37338,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37380,7 +37380,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37422,7 +37422,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37464,7 +37464,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37511,7 +37511,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37553,7 +37553,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37595,7 +37595,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37732,7 +37732,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DatagramChannelImpl.c"</Elem>
@@ -37748,7 +37748,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DatagramDispatcher.c"</Elem>
@@ -37764,7 +37764,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DevPollArrayWrapper.c"</Elem>
@@ -37780,7 +37780,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileChannelImpl.c"</Elem>
@@ -37796,7 +37796,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileDispatcherImpl.c"</Elem>
@@ -37812,7 +37812,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileKey.c"</Elem>
@@ -37828,7 +37828,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="IOUtil.c"</Elem>
@@ -37844,7 +37844,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="InheritedChannel.c"</Elem>
@@ -37860,7 +37860,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="NativeThread.c"</Elem>
@@ -37876,7 +37876,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Net.c"</Elem>
@@ -37892,7 +37892,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="PollArrayWrapper.c"</Elem>
@@ -37908,7 +37908,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ServerSocketChannelImpl.c"</Elem>
@@ -37924,7 +37924,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="SocketChannelImpl.c"</Elem>
@@ -37940,7 +37940,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="SocketDispatcher.c"</Elem>
@@ -37956,7 +37956,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="SolarisEventPort.c"</Elem>
@@ -37972,7 +37972,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="UnixAsynchronousServerSocketChannelImpl.c"</Elem>
@@ -37988,7 +37988,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="UnixAsynchronousSocketChannelImpl.c"</Elem>
@@ -38037,7 +38037,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -38073,7 +38073,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -38110,7 +38110,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -38147,7 +38147,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -38184,7 +38184,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -38210,7 +38210,7 @@
             flavor2="0">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="genSolarisConstants.c"</Elem>
@@ -38223,7 +38223,7 @@
             flavor2="0">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -39157,7 +39157,7 @@
       <folder path="$SRC/jdk/make">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -39192,7 +39192,7 @@
             <pElem>../../jdk/src/share/back</pElem>
             <pElem>../../jdk/src/solaris/back</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -39278,7 +39278,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </ccTool>
       </folder>
@@ -39288,7 +39288,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -39297,7 +39297,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
@@ -39309,7 +39309,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="gctest.c"</Elem>
@@ -39322,7 +39322,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="heapTracker.c"</Elem>
@@ -39334,7 +39334,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="heapViewer.c"</Elem>
@@ -39349,7 +39349,7 @@
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="debug_malloc.c"</Elem>
@@ -39364,7 +39364,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="java_crw_demo.c"</Elem>
@@ -39377,7 +39377,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="minst.c"</Elem>
@@ -39390,7 +39390,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="mtrace.c"</Elem>
@@ -39402,7 +39402,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="versionCheck.c"</Elem>
@@ -39422,7 +39422,7 @@
             <pElem>../../jdk/src/share/instrument</pElem>
             <pElem>../../jdk/src/solaris/instrument</pElem>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -39467,7 +39467,7 @@
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
             <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -39571,7 +39571,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -39602,7 +39602,7 @@
         <cTool>
           <incDir>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -39624,7 +39624,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -39654,7 +39654,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -39681,7 +39681,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DatagramPacket.c"</Elem>
@@ -39713,7 +39713,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -39750,7 +39750,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -39794,7 +39794,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -39830,7 +39830,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -39905,7 +39905,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -39935,7 +39935,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -39978,7 +39978,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -40013,7 +40013,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -40048,7 +40048,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -40094,7 +40094,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -40130,7 +40130,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -40183,7 +40183,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -40225,7 +40225,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -40248,7 +40248,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -40277,7 +40277,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -40309,7 +40309,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -40330,7 +40330,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40375,7 +40375,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40403,7 +40403,7 @@
       <folder path="$SRC/jdk/src/share/native/sun/nio">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
@@ -40435,7 +40435,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40492,7 +40492,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
             <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
@@ -40504,7 +40504,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
             <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MP_API_COMPATIBLE</Elem>
@@ -40517,7 +40517,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="GSSLibStub.c"</Elem>
@@ -40531,7 +40531,7 @@
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
             <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="p11_convert.c"</Elem>
@@ -40544,7 +40544,7 @@
             <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="pcsc.c"</Elem>
@@ -40563,7 +40563,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40595,7 +40595,7 @@
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40629,7 +40629,7 @@
             <pElem>../../jdk/src/solaris/transport/socket</pElem>
             <pElem>../../jdk/src/share/back/export</pElem>
             <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40674,7 +40674,7 @@
             <pElem>../../jdk/src/share/back</pElem>
             <pElem>../../jdk/src/solaris/back</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40707,7 +40707,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40762,7 +40762,7 @@
         <cTool>
           <incDir>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/democlasses/jni/Poller</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -40774,7 +40774,7 @@
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="hprof_md.c"</Elem>
@@ -40794,7 +40794,7 @@
             <pElem>../../jdk/src/share/instrument</pElem>
             <pElem>../../jdk/src/solaris/instrument</pElem>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40854,7 +40854,7 @@
         <cTool>
           <incDir>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -40863,7 +40863,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
             <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>EXTRA_SOUND_JNI_LIBS=""</Elem>
@@ -40878,7 +40878,7 @@
       <folder path="$SRC/jdk/src/solaris/native/com/sun/security">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Solaris.c"</Elem>
@@ -40910,7 +40910,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40982,7 +40982,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -41011,7 +41011,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -41031,7 +41031,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
@@ -41045,7 +41045,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
@@ -41070,7 +41070,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -41126,7 +41126,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -41155,7 +41155,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -41203,7 +41203,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -41247,7 +41247,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -41282,7 +41282,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -41359,7 +41359,7 @@
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -41404,7 +41404,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -41415,7 +41415,7 @@
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
             <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="p11_md.c"</Elem>
@@ -41428,7 +41428,7 @@
             <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="pcsc_md.c"</Elem>
@@ -41446,7 +41446,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -41477,7 +41477,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -41522,7 +41522,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -41573,7 +41573,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -41611,7 +41611,7 @@
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -41645,7 +41645,7 @@
             <pElem>../../jdk/src/solaris/transport/socket</pElem>
             <pElem>../../jdk/src/share/back/export</pElem>
             <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
jdk-sandbox