From c1e791d393ae5a781cd9d46dc543cf1dd18bf68d Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 16 Nov 2006 22:51:36 +0000
Subject: [PATCH] New safer library locating process.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4456 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 build.xml     | 18 ++++++------------
 libs-incl.xml | 17 ++++++++---------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/build.xml b/build.xml
index 9d304d812..c76e98e3e 100644
--- a/build.xml
+++ b/build.xml
@@ -6,18 +6,12 @@
   <property file="build.properties"/>
 
   <!-- configuration parameters -->
-  <property name="app.name"       value="narya"/>
-  <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"/>
-
-  <!-- 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="app.name"     value="narya"/>
+  <property name="deploy.dir"   value="dist"/>
+  <property name="savedoc.dir"  value="docs"/>
+  <property name="javadoc.home" value="${deploy.dir}/docs"/>
+  <property name="classes.dir"  value="${deploy.dir}/classes"/>
+  <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 46deeb229..6c2659dc3 100644
--- a/libs-incl.xml
+++ b/libs-incl.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
 <!-- declares the libraries needed to build narya -->
 <project name="library-dependencies">
-  <fileset dir="${projects.root}" id="narya.libs">
-    <include name="${libs.dir}/commons-io.jar"/>
-    <include name="${libs.dir}/commons-lang.jar"/>
-    <include name="${libs.dir}/junit-3.7.jar"/>
-    <include name="${libs.dir}/retroweaver-all-1.2.2.jar"/>
-    <include name="${libs.dir}/velocity-1.5-dev.jar"/>
-    <include name="${libs.dir}/samskivert.jar"/>
-    <include name="${libs.dir}/commons-collections.jar"/>
-    <include name="${distlib.dir}/samskivert.jar"/>
+  <fileset dir="${libs.dir}" id="narya.libs">
+    <include name="commons-collections.jar"/>
+    <include name="commons-io.jar"/>
+    <include name="commons-lang.jar"/>
+    <include name="junit-3.7.jar"/>
+    <include name="retroweaver-all-1.2.2.jar"/>
+    <include name="samskivert.jar"/>
+    <include name="velocity-1.5-dev.jar"/>
   </fileset>
 </project>