From 81cd97edc7945e21ed59bfcac9a30fb407a9f898 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 16 Nov 2006 23:13:21 +0000
Subject: [PATCH] New libs.dir business.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@78 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 build.xml     | 14 ++++++--------
 libs-incl.xml | 38 +++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/build.xml b/build.xml
index 882ca931..306268e9 100644
--- a/build.xml
+++ b/build.xml
@@ -6,18 +6,16 @@
   <property file="build.properties"/>
 
   <!-- configuration parameters -->
-  <property name="app.name"       value="nenya"/>
-  <property name="deploy.dir"     value="dist"/>
-  <property name="savedoc.dir"    value="docs"/>
+  <property name="app.name"    value="nenya"/>
+  <property name="deploy.dir"  value="dist"/>
+  <property name="savedoc.dir" value="docs"/>
 
   <!-- derived properties -->  
-  <property name="javadoc.home"   value="${deploy.dir}/docs"/>
-  <property name="classes.dir"    value="${deploy.dir}/classes"/>
+  <property name="javadoc.home" value="${deploy.dir}/docs"/>
+  <property name="classes.dir"  value="${deploy.dir}/classes"/>
 
   <!-- import some targets to enumerate library dependencies -->
-  <property name="projects.root" value="."/>
-  <property name="libs.dir"      value="lib"/>
-  <property name="distlib.dir"   value="lib"/>
+  <property name="libs.dir" value="lib"/>
   <import file="libs-incl.xml"/>
 
   <!-- declare our classpath business -->
diff --git a/libs-incl.xml b/libs-incl.xml
index 5fe2fda7..545af1f8 100644
--- a/libs-incl.xml
+++ b/libs-incl.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <!-- declares the libraries needed to build nenya -->
 <project name="library-dependencies">
-  <fileset dir="${projects.root}" id="nenya.libs">
-    <include name="${libs.dir}/commons-collections.jar"/>
-    <include name="${libs.dir}/commons-digester.jar"/>
-    <include name="${libs.dir}/commons-io.jar"/>
-    <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"/>
-    <include name="${distlib.dir}/samskivert.jar"/>
-    <include name="${distlib.dir}/narya-base.jar"/>
-    <include name="${distlib.dir}/narya-distrib.jar"/>
+  <fileset dir="${libs.dir}" id="nenya.libs">
+    <include name="commons-collections.jar"/>
+    <include name="commons-digester.jar"/>
+    <include name="commons-io.jar"/>
+    <include name="junit-3.7.jar"/>
+    <include name="narya-base.jar"/>
+    <include name="narya-distrib.jar"/>
+    <include name="retroweaver-all-1.2.2.jar"/>
+    <include name="samskivert.jar"/>
+    <include name="xml-writer.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"/>
+    <include name="lwjgl.jar"/>
+    <include name="lwjgl_util.jar"/>
+    <include name="jme-awt.jar"/>
+    <include name="jme-effects.jar"/>
+    <include name="jme-model.jar"/>
+    <include name="jme-sound.jar"/>
+    <include name="jme-terrain.jar"/>
+    <include name="jme.jar"/>
+    <include name="jme-bui.jar"/>
   </fileset>
 </project>