From 3a8676f56850304c782c0121dcaad2d44ef2baec Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 20 Apr 2011 21:35:49 +0200
Subject: Remove redundant setup.java.home.dir, use proper
 gluegen-cpptasks-base.xml target gluegen.cpptasks.setup.compiler (instead of
 gluegen.cpptasks.detect.compiler)

---
 make/build.xml | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/make/build.xml b/make/build.xml
index 99b9e2b..78f7cdc 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -202,21 +202,6 @@
     </gluegen>
   </target>
 
-    <!-- ================================================================== -->
-    <!-- 
-       - Set up java.home.dir appropriately on all platforms.
-      -->
-    <target name="setup.java.home.dir.nonmacosx" depends="gluegen.properties.load.user" unless="isOSX">
-      <!-- java home dir is up one directory as java.home points to '<java-install-dir>/jre' -->
-      <property name="java.home.dir" value="${java.home}/.." />
-    </target>
-    <target name="setup.java.home.dir.macosx" depends="gluegen.properties.load.user" if="isOSX">
-      <property name="java.home.dir" value="/System/Library/Frameworks/JavaVM.framework/Home" />
-    </target>
-    <target name="setup.java.home.dir" depends="setup.java.home.dir.nonmacosx,setup.java.home.dir.macosx" >
-      <property name="java.includes.dir" value="${java.home.dir}/include" />
-    </target>
-
     <!-- ================================================================== -->
     <!-- 
        - Compile the native C code for GlueGen's dynamic linker interface.
@@ -349,7 +334,7 @@
       <property name="java.includes.dir.hpux"               value="${java.includes.dir}/hp-ux" />
     </target>
 
-    <target name="c.configure" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.detect.compiler,setup.java.home.dir,declare.win32,declare.linux,declare.solaris,declare.macosx,declare.freebsd,declare.hpux,gluegen.cpptasks.configure.compiler" unless="build.javaonly" >
+    <target name="c.configure" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler,declare.win32,declare.linux,declare.solaris,declare.macosx,declare.freebsd,declare.hpux,gluegen.cpptasks.configure.compiler" unless="build.javaonly" >
       <!-- Common properties -->
       <property name="java.includes.dir" value="${java.home.dir}/include" /> <!-- NOTE:  this MUST be relative for FileSet -->
 
-- 
cgit v1.2.3