[cig-commits] r13772 - cs/cigma/trunk

[luis at geodynamics.org]

Author: luis
Date: 2008-12-17 02:33:47 -0800 (Wed, 17 Dec 2008)
New Revision: 13772

Modified:
   cs/cigma/trunk/Makefile.am
Log:
Move automake rules to top of file (variables set below)

Modified: cs/cigma/trunk/Makefile.am
===================================================================
--- cs/cigma/trunk/Makefile.am	2008-12-17 10:33:44 UTC (rev 13771)
+++ cs/cigma/trunk/Makefile.am	2008-12-17 10:33:47 UTC (rev 13772)
@@ -55,6 +55,23 @@
 cigma_test_LDADD    = $(cigma_test_ldadd)
 endif
 
+# _cigma.so
+if COND_BOOST_PYTHON
+if COND_USE_DISTUTILS
+pyexec_PROGRAMS = _cigma.so
+_cigma_so_SOURCES  = $(cigma_mod_sources)
+_cigma_so_CPPFLAGS = $(cigma_mod_cppflags)
+_cigma_so_LDADD    = $(cigma_mod_libs)
+else
+pyexec_LTLIBRARIES = _cigma.la
+_cigma_la_DEPENDENCIES = libcigma.la libann.la
+_cigma_la_SOURCES      = $(cigma_mod_sources)
+_cigma_la_CPPFLAGS     = $(cigma_mod_cppflags)
+_cigma_la_LDFLAGS      = -module -avoid-version $(cigma_mod_ldflags)
+_cigma_la_LIBADD       = $(cigma_mod_libs)
+endif
+endif
+
 # Additional files to include in tarball
 EXTRA_DIST =
 
@@ -358,6 +375,7 @@
 	src/py_cigma_module.cpp
 # }}}
 
+
 if COND_USE_DISTUTILS
 #
 # Approximately, this is how distutils will compile the source files:
@@ -374,14 +392,6 @@
 # 	  -g -O2 py_*.o libcigma.a libann.a -lboost_filesystem -lboost_python
 # 	  -o _cigma.so
 #
-
-if COND_BOOST_PYTHON
-pyexec_PROGRAMS = _cigma.so
-_cigma_so_SOURCES  = $(cigma_mod_sources)
-_cigma_so_CPPFLAGS = $(cigma_mod_cppflags)
-_cigma_so_LDADD    = $(cigma_mod_libs)
-endif
-
 _cigma.so: $(cigma_mod_sources) $(cigma_mod_dependencies)
 	BUILD_DIR=`cd $(top_builddir); pwd`; \
 	(cd $(srcdir); \
@@ -394,22 +404,12 @@
 	rm -rf pybuild
 
 else
-
 #
 # Use libtool instead of distutils
 #
-if COND_BOOST_PYTHON
-pyexec_LTLIBRARIES = _cigma.la
-_cigma_la_DEPENDENCIES = libcigma.la libann.la
-_cigma_la_SOURCES      = $(cigma_mod_sources)
-_cigma_la_CPPFLAGS     = $(cigma_mod_cppflags)
-_cigma_la_LDFLAGS      = -module -avoid-version $(cigma_mod_ldflags)
-_cigma_la_LIBADD       = $(cigma_mod_libs)
 endif
 
-endif
 
-
 cigma_mod_cppflags =
 cigma_mod_cppflags += -Wno-deprecated
 cigma_mod_cppflags += $(LOGGER_FLAGS)