[cig-commits] r5263 - in long/3D/Gale/trunk: . src/StGermain

[walter at geodynamics.org]

Author: walter
Date: 2006-11-14 03:21:53 -0800 (Tue, 14 Nov 2006)
New Revision: 5263

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/SConstruct
   long/3D/Gale/trunk/src/StGermain/SConscript
Log:
 r1082 at earth:  boo | 2006-11-14 03:20:48 -0800
 Make all of StGermain tests run



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1081
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1082

Modified: long/3D/Gale/trunk/SConstruct
===================================================================
--- long/3D/Gale/trunk/SConstruct	2006-11-14 11:21:50 UTC (rev 5262)
+++ long/3D/Gale/trunk/SConstruct	2006-11-14 11:21:53 UTC (rev 5263)
@@ -246,10 +246,7 @@
 SConscript('build/SConscript')
 make_test_deps=True
 Export('make_test_deps')
-SConscript('build/StGermain/libStGermain/SConscript')
-SConscript('build/StGermain/FD/SConscript')
-SConscript('build/StGermain/Discretisation/SConscript')
-SConscript('build/StGermain/Base/SConscript')
+SConscript('build/StGermain/SConscript')
 
 # We have to do a fake install of the headers, because otherwise the
 # libraries won't build.  We have to do a fake install of the

Modified: long/3D/Gale/trunk/src/StGermain/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/SConscript	2006-11-14 11:21:50 UTC (rev 5262)
+++ long/3D/Gale/trunk/src/StGermain/SConscript	2006-11-14 11:21:53 UTC (rev 5263)
@@ -15,12 +15,15 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-StGermain_static_objects=[]
-Export('StGermain_static_objects')
+Import('make_test_deps')
 
-StGermain_static_library=[]
-Export('StGermain_static_library')
+if not make_test_deps:
+    StGermain_static_objects=[]
+    Export('StGermain_static_objects')
 
+    StGermain_static_library=[]
+    Export('StGermain_static_library')
+
 SConscript('Regresstor/SConscript')
 SConscript('Base/SConscript')
 SConscript('Discretisation/SConscript')