From a8e185520721b007e08f1d87773b689673999070 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 16 Nov 2006 21:26:58 +0000
Subject: [PATCH] Use distlib.dir.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@76 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 build.xml     |  3 ++-
 libs-incl.xml | 32 +++++++++++++-------------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/build.xml b/build.xml
index 67f9bb81..882ca931 100644
--- a/build.xml
+++ b/build.xml
@@ -16,7 +16,8 @@
 
   <!-- import some targets to enumerate library dependencies -->
   <property name="projects.root" value="."/>
-  <property name="libs.dir" value="lib"/>
+  <property name="libs.dir"      value="lib"/>
+  <property name="distlib.dir"   value="lib"/>
   <import file="libs-incl.xml"/>
 
   <!-- declare our classpath business -->
diff --git a/libs-incl.xml b/libs-incl.xml
index e69dc07b..5fe2fda7 100644
--- a/libs-incl.xml
+++ b/libs-incl.xml
@@ -8,24 +8,18 @@
     <include name="${libs.dir}/junit-3.7.jar"/>
     <include name="${libs.dir}/retroweaver-all-1.2.2.jar"/>
     <include name="${libs.dir}/xml-writer.jar"/>
-    <!-- these might come from lib/ -->
-    <include name="${libs.dir}/samskivert.jar"/>
-    <include name="${libs.dir}/narya-base.jar"/>
-    <include name="${libs.dir}/narya-distrib.jar"/>
-    <!-- or from the build directories of the actual projects -->
-    <include name="${project.dir}/samskivert/dist/samskivert.jar"/>
-    <include name="${project.dir}/narya/dist/narya-base.jar"/>
-    <include name="${project.dir}/narya/dist/narya-distrib.jar"/>
-    <!-- these LWJGL and JME libraries are optional -->
-    <include name="lib/lwjgl.jar"/>
-    <include name="lib/lwjgl_util.jar"/>
-    <include name="lib/jme-awt.jar"/>
-    <include name="lib/jme-effects.jar"/>
-    <include name="lib/jme-model.jar"/>
-    <include name="lib/jme-sound.jar"/>
-    <include name="lib/jme-terrain.jar"/>
-    <include name="lib/jme.jar"/>
-    <include name="lib/jme-bui.jar"/>
-    <include name="${project.dir}/jme-bui/dist/jme-bui.jar"/>
+    <include name="${distlib.dir}/samskivert.jar"/>
+    <include name="${distlib.dir}/narya-base.jar"/>
+    <include name="${distlib.dir}/narya-distrib.jar"/>
+    <!-- these LWJGL, JME and JME-BUI libraries are optional -->
+    <include name="${distlib.dir}/lwjgl.jar"/>
+    <include name="${distlib.dir}/lwjgl_util.jar"/>
+    <include name="${distlib.dir}/jme-awt.jar"/>
+    <include name="${distlib.dir}/jme-effects.jar"/>
+    <include name="${distlib.dir}/jme-model.jar"/>
+    <include name="${distlib.dir}/jme-sound.jar"/>
+    <include name="${distlib.dir}/jme-terrain.jar"/>
+    <include name="${distlib.dir}/jme.jar"/>
+    <include name="${distlib.dir}/jme-bui.jar"/>
   </fileset>
 </project>