From f2801bf69ba572d9e030e3fbf920342c29704d3a Mon Sep 17 00:00:00 2001
From: sg215889 <sg215889@jordan.goethel.localnet>
Date: Wed, 15 Jul 2009 05:47:43 -0700
Subject: Build CDC named JARs for CVM in default build, no more specialized
 build necessary.

---
 make/build.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'make/build.xml')

diff --git a/make/build.xml b/make/build.xml
index a3f0530d1..3e7c74c53 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -113,16 +113,15 @@
             </filterset>
         </copy>
         <mkdir dir="${archive.dir}/lib" />
-        <copy file="${project.root}/../gluegen/${rootrel.build}/gluegen-rt.jar" todir="${archive.dir}/lib" />
         <copy todir="${archive.dir}/lib">
-            <fileset dir="${project.root}/../gluegen/${rootrel.build}" includes="gluegen-rt.jar" />
-            <fileset dir="${project.root}/../gluegen/${rootrel.build}/obj" includes="*.${native.library.suffix}" />
+            <fileset dir="${project.root}/../gluegen/${rootrel.build}" includes="gluegen-rt.jar gluegen-rt-cdc.jar" />
+            <fileset dir="${project.root}/../gluegen/${rootrel.build}/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
             <fileset dir="${build}/jogl" includes="*.jar" excludes="*natives*.jar" />
-            <fileset dir="${build}/jogl/obj" includes="*.${native.library.suffix}" />
+            <fileset dir="${build}/jogl/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
             <fileset dir="${build}/nativewindow" includes="*.jar" excludes="*natives*.jar" />
-            <fileset dir="${build}/nativewindow/obj" includes="*.${native.library.suffix}" />
+            <fileset dir="${build}/nativewindow/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
             <fileset dir="${build}/newt" includes="*.jar" excludes="*natives*.jar" />
-            <fileset dir="${build}/newt/obj" includes="*.${native.library.suffix}" />
+            <fileset dir="${build}/newt/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
         </copy>
         <mkdir dir="${archive.dir}/etc" />
         <copy todir="${archive.dir}/etc">
-- 
cgit v1.2.3