[cig-commits] r5308 - mc/3D/CitcomS/trunk/bin

[leif at geodynamics.org]

Author: leif
Date: 2006-11-16 13:58:42 -0800 (Thu, 16 Nov 2006)
New Revision: 5308

Modified:
   mc/3D/CitcomS/trunk/bin/Makefile.am
Log:
Reverted another recent decision of mine:  Always build the
legacy drivers, 'CitcomSFull' and 'CitcomSRegional'.  I took
these out of the Pyre build to avoid confusion; but now -- thinking
of shared installations of CitcomS on clusters -- I think they should
always be built (as they were before) so that users have the option.


Modified: mc/3D/CitcomS/trunk/bin/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/bin/Makefile.am	2006-11-16 21:36:50 UTC (rev 5307)
+++ mc/3D/CitcomS/trunk/bin/Makefile.am	2006-11-16 21:58:42 UTC (rev 5308)
@@ -31,18 +31,16 @@
     AM_CPPFLAGS += -DUSE_HDF5
 endif
 
+bin_PROGRAMS = CitcomSFull CitcomSRegional
 
 if COND_PYRE
 
 if COND_EMBEDDING
-    bin_PROGRAMS = pycitcoms mpipycitcoms
-else
-    bin_PROGRAMS =
+    bin_PROGRAMS += pycitcoms mpipycitcoms
 endif
 
     bin_SCRIPTS = citcoms
 else
-    bin_PROGRAMS = CitcomSFull CitcomSRegional
     bin_SCRIPTS =
 endif