From 14c6e3b98b04d87abf738c5ed7bfd7746dab8e08 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 1 Feb 2013 11:53:35 +0100
Subject: Build: Include cd and cdr test files in joa-test.jar; joal-natives*:
 Only include native library w/o version number.

---
 make/build-test.xml | 2 ++
 make/build.xml      | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/make/build-test.xml b/make/build-test.xml
index 060863e..31f5f9c 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -170,6 +170,8 @@
         <copy todir="${classes.test}">
             <fileset dir="${src.test}">
                 <include name="**/*.wav"/>
+                <include name="**/*.cd"/>
+                <include name="**/*.cdr"/>
                 <exclude name="**/*.java"/>
             </fileset>
         </copy>
diff --git a/make/build.xml b/make/build.xml
index 69aa72d..30901ab 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -437,9 +437,7 @@
         <fileset dir="../${rootrel.build}/obj">
           <include name="*joal.${native.library.suffix}" />
           <include name="*openal.${native.library.suffix}" />
-        </fileset>
-        <fileset dir="lib/${os.and.arch}" erroronmissingdir="false">
-          <include name="*.${native.library.suffix}" />
+          <exclude name="*openal*.1*.${native.library.suffix}" />
         </fileset>
       </jar>
     </target>
-- 
cgit v1.2.3