changeset 2501:a086a3d98711

6960853: Cleanup makefiles, remove unused vars etc. Reviewed-by: alanb
author ohair
date Sun, 20 Jun 2010 14:51:33 -0700
parents 43dfa39686a1
children 840265545bc3
files make/common/shared/Defs-control.gmk make/netbeans/README make/netbeans/world/README make/netbeans/world/build.xml
diffstat 4 files changed, 6 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/shared/Defs-control.gmk	Sat Jun 19 17:42:39 2010 -0700
+++ b/make/common/shared/Defs-control.gmk	Sun Jun 20 14:51:33 2010 -0700
@@ -35,9 +35,6 @@
   JDK_MAKE_SHARED_DIR = $(JDK_TOPDIR)/make/common/shared
 endif
 
-ifndef CONTROL_TOPDIR
-  CONTROL_TOPDIR=$(TOPDIR)
-endif
 ifndef HOTSPOT_TOPDIR
   HOTSPOT_TOPDIR=$(TOPDIR)/hotspot
 endif
--- a/make/netbeans/README	Sat Jun 19 17:42:39 2010 -0700
+++ b/make/netbeans/README	Sun Jun 20 14:51:33 2010 -0700
@@ -204,8 +204,8 @@
         note that pretty much regardless of your hardware, this *will* take
         a long time, and use *lots* of disk space (more than 3GB). The
         results of the build are in
-        *install-dir*/control/build/*platform*-*arch* and
-        *install-dir*/control/build/*platform*-*arch*-fastdebug.
+        *install-dir*/build/*platform*-*arch* and
+        *install-dir*/build/*platform*-*arch*-fastdebug.
 
         Consult the project's README file for details.
 
--- a/make/netbeans/world/README	Sat Jun 19 17:42:39 2010 -0700
+++ b/make/netbeans/world/README	Sun Jun 20 14:51:33 2010 -0700
@@ -10,6 +10,6 @@
 Please note: the results of building this project are *not* put in the place
 used by other projects.  In this case, the results are place in
 
-    <install-dir>/control/build/<platform>-<arch>
+    <install-dir>/build/<platform>-<arch>
 and
-    <install-dir>/control/build/<platform>-<arch>-fastdebug
+    <install-dir>/build/<platform>-<arch>-fastdebug
--- a/make/netbeans/world/build.xml	Sat Jun 19 17:42:39 2010 -0700
+++ b/make/netbeans/world/build.xml	Sun Jun 20 14:51:33 2010 -0700
@@ -34,11 +34,11 @@
     <import file="../common/shared.xml"/>
 
     <target name="-build-make" depends="-make.init" if="use.make">
-        <make-run target="dev" dir="${root}/../control/make" opts="SKIP_COMPARE_IMAGES=true"/>
+        <make-run target="dev" dir="${root}/.." opts="SKIP_COMPARE_IMAGES=true"/>
     </target>
 
     <target name="-clean-make" depends="-make.init" if="use.make">
-        <make-run target="clean" dir="${root}/../control/make"/>
+        <make-run target="clean" dir="${root}/.."/>
     </target>
 
 </project>