Return-Path: 
 <commits-return-59845-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 39396 invoked from network); 17 Aug 2009 14:20:48 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 17 Aug 2009 14:20:48 -0000
Received: (qmail 23944 invoked by uid 500); 17 Aug 2009 14:20:54 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 23918 invoked by uid 500); 17 Aug 2009 14:20:54 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 23908 invoked by uid 99); 17 Aug 2009 14:20:54 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Aug 2009 14:20:54 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Aug 2009 14:20:52 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6AE7123888E9; Mon, 17 Aug 2009 14:20:32 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r804992 - in /harmony/enhanced/classlib/trunk: build.xml
 make/build-native.xml
Date: Mon, 17 Aug 2009 14:20:32 -0000
To: commits@harmony.apache.org
From: hindessm@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090817142032.6AE7123888E9@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hindessm
Date: Mon Aug 17 14:20:31 2009
New Revision: 804992

URL: http://svn.apache.org/viewvc?rev=804992&view=rev
Log:
Move makefile hdk setup to be consistent with ant hdk setup.

Modified:
    harmony/enhanced/classlib/trunk/build.xml
    harmony/enhanced/classlib/trunk/make/build-native.xml

Modified: harmony/enhanced/classlib/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/build.xml?rev=804992&r1=804991&r2=804992&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/build.xml (original)
+++ harmony/enhanced/classlib/trunk/build.xml Mon Aug 17 14:20:31 2009
@@ -320,6 +320,7 @@
 
     <target name="-clean-hdk">
         <delete dir="${hy.hdk}/build/ant" />
+	<delete dir="${hy.hdk}/build/make" />
     </target>
     
     <macrodef name="chksum">
@@ -358,6 +359,14 @@
                   tofile="${hy.hdk}/build/ant/depends.properties"
                   outputencoding="UTF-8" >
             </copy>
+
+	    <mkdir dir="${hy.hdk}/build/make" />
+	    <copy todir="${hy.hdk}/build/make" overwrite="yes">
+                <fileset dir="depends/build">
+                    <include name="**" />
+                </fileset>
+            </copy>
+
         </sequential>
     </macrodef>
 

Modified: harmony/enhanced/classlib/trunk/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-native.xml?rev=804992&r1=804991&r2=804992&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-native.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-native.xml Mon Aug 17 14:20:31 2009
@@ -31,7 +31,6 @@
     <import file="${basedir}/make/properties.xml" />
     <import file="${basedir}/make/depends.xml" />
 
-    <property name="depends.build" location="depends/build" />
     <property name="depends.oss" location="depends/oss" />
     <property name="depends.libs" location="depends/libs/${hy.platform}" />
     <property name="depends.files" location="depends/files" />
@@ -54,17 +53,18 @@
     <!-- ================================= 
           target: build
          ================================= -->
-    <target name="build" depends="overlay-oss,copy-includes,layout,make-all" />
+    <target name="build"
+            depends="overlay-oss,copy-includes,layout,build-modules" />
 
 
     <!-- ================================= 
           target: clean              
          ================================= -->
-    <target name="clean" depends="make-clean,clean-includes,clean-layout" />
+    <target name="clean" depends="clean-modules,clean-includes,clean-layout" />
 
 
     <!-- This target invokes make on the all target to compile all natives -->
-    <target name="make-all" depends="copy-makefile-includes">
+    <target name="build-modules">
     	
     	<!-- These module targets take care of building and copying
              their shared libs -->
@@ -82,10 +82,7 @@
     <!-- ================================= 
           target: make-clean              
          ================================= -->
-    <target name="make-clean"
-        depends="copy-makefile-includes,-make-clean,clean-makefile-includes" />
-
-    <target name="-make-clean">
+    <target name="clean-modules">
         <poll-modules target="clean-native" />
     	<delete dir="${native.lib.target}" />
     </target>
@@ -174,26 +171,4 @@
         <delete dir="${hy.hdk}/jdk/include" />
     </target>
 
-    <!-- ================================= 
-          target: copy-makefile-includes              
-         ================================= -->
-    <target name="copy-makefile-includes">
-	<!-- copy generic defines and rules for each platform into a shared
-	     place -->
-	<mkdir dir="${hy.hdk}/build/make" />
-	<copy todir="${hy.hdk}/build/make" overwrite="yes">
-            <fileset dir="${depends.build}">
-                <include name="**" />
-            </fileset>
-        </copy>
-    </target>
-	
-    <!-- ================================= 
-          target: clean-makefile-includes              
-         ================================= -->
-    <target name="clean-makefile-includes">
-	<!-- delete generic defines and rules -->
-	<delete dir="${hy.hdk}/build/make" />
-    </target>
-
 </project>