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

[luis at geodynamics.org]

Author: luis
Date: 2008-12-09 18:16:27 -0800 (Tue, 09 Dec 2008)
New Revision: 13627

Modified:
   cs/cigma/trunk/Makefile.am
Log:
Now using libtool for building libann.a and libcigma.a

Modified: cs/cigma/trunk/Makefile.am
===================================================================
--- cs/cigma/trunk/Makefile.am	2008-12-10 02:16:26 UTC (rev 13626)
+++ cs/cigma/trunk/Makefile.am	2008-12-10 02:16:27 UTC (rev 13627)
@@ -5,15 +5,6 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I ./config
 
-# Directories to build
-#SUBDIRS = src
-#if BUILD_CPPUNIT_TESTS
-#  SUBDIRS += tests
-#endif
-
-# Distribute these directories
-#DIST_SUBDIRS = $(SUBDIRS)
-
 # Main programs to build
 bin_PROGRAMS = cigma h5attr
 
@@ -21,7 +12,7 @@
 lib_LTLIBRARIES =
 
 # Internal libraries
-noinst_LIBRARIES = libann.a libcigma.a
+noinst_LTLIBRARIES = libann.la libcigma.la
 
 # Which tests to compile on 'make check'
 check_PROGRAMS =
@@ -29,14 +20,15 @@
 # Which tests to run on 'make check'
 TESTS =
 
-# libann.a
-ANN_FLAGS = -I$(top_srcdir)/src/contrib/ann/include
-libann_a_SOURCES  = $(libann_a_sources)
-libann_a_CPPFLAGS = $(libann_a_cppflags)
+# libann.la
+libann_la_SOURCES  = $(libann_la_sources)
+libann_la_CPPFLAGS = $(ANN_FLAGS)
+libann_la_LDFLAGS  = -static
 
-# libcigma.a
-libcigma_a_SOURCES  = $(libcigma_a_sources)
-libcigma_a_CPPFLAGS = $(libcigma_a_cppflags)
+# libcigma.la
+libcigma_la_SOURCES  = $(libcigma_la_sources)
+libcigma_la_CPPFLAGS = $(libcigma_la_cppflags)
+libcigma_la_LDFLAGS  = -static
 
 # cigma
 cigma_SOURCES  = $(cigma_sources)
@@ -66,7 +58,7 @@
 
 ###############################################################################
 # Trivial logger
-# Select logging method for cxxtl
+
 # XXX: determine these from a ./configure option
 #LOGGER_FLAGS = -DTLOG
 LOGGER_FLAGS = -DETLOG
@@ -77,9 +69,9 @@
 # libann.a library
 # {{{
 
-libann_a_cppflags = $(ANN_FLAGS)
+ANN_FLAGS = -I$(top_srcdir)/src/contrib/ann/include
 
-libann_a_sources = \
+libann_la_sources = \
 	src/contrib/ann/include/ANN/ANN.h \
 	src/contrib/ann/include/ANN/ANNperf.h \
 	src/contrib/ann/include/ANN/ANNx.h \
@@ -113,7 +105,8 @@
 # libcigma.a library
 # {{{
 
-libcigma_a_sources = \
+# source files {{{
+libcigma_la_sources = \
 	src/nullstream.hpp \
 	src/tri_logger.hpp \
 	src/tri_logger.cpp \
@@ -209,16 +202,17 @@
 	src/core_list_op.cpp \
 	src/ProgressTimer.h \
 	src/ProgressTimer.cpp
+# }}}
 
-libcigma_a_cppflags =
-libcigma_a_cppflags += -Wno-deprecated
-libcigma_a_cppflags += $(LOGGER_FLAGS)
-libcigma_a_cppflags += $(BOOST_CPPFLAGS)
-libcigma_a_cppflags += $(ANN_FLAGS)
+libcigma_la_cppflags =
+libcigma_la_cppflags += -Wno-deprecated
+libcigma_la_cppflags += $(LOGGER_FLAGS)
+libcigma_la_cppflags += $(BOOST_CPPFLAGS)
+libcigma_la_cppflags += $(ANN_FLAGS)
 
 #if COND_HDF5
-libcigma_a_cppflags += $(HDF5_INCLUDES)
-libcigma_a_sources  += \
+libcigma_la_cppflags += $(HDF5_INCLUDES)
+libcigma_la_sources  += \
 	src/io_hdf5.h \
 	src/io_hdf5.cpp \
 	src/io_hdf5_reader.h \
@@ -228,8 +222,8 @@
 #endif
 
 if COND_VTK
-libcigma_a_cppflags += $(VTK_INCLUDES)
-libcigma_a_sources  += \
+libcigma_la_cppflags += $(VTK_INCLUDES)
+libcigma_la_sources  += \
 	src/io_vtk.h \
 	src/io_vtk.cpp \
 	src/io_vtk_reader.h \
@@ -277,8 +271,8 @@
 cigma_ldadd += $(BOOST_SYSTEM_LIB)
 cigma_ldadd += $(BOOST_FILESYSTEM_LIB)
 cigma_ldadd += $(BOOST_PROGRAM_OPTIONS_LIB)
-cigma_ldadd += libcigma.a
-cigma_ldadd += libann.a
+cigma_ldadd += libcigma.la
+cigma_ldadd += libann.la
 
 #if COND_HDF5
 cigma_ldflags += $(HDF5_LDFLAGS)
@@ -394,7 +388,7 @@
 _cigma.so: $(cigma_mod_sources) $(cigma_mod_dependencies)
 	BUILD_DIR=`cd $(top_builddir); pwd`; \
 	(cd $(srcdir); \
-	CFLAGS="-I$(top_srcdir) $(CPPFLAGS) $(libcigma_a_cppflags) $(AM_CXXFLAGS) $(CXXFLAGS)" \
+	CFLAGS="-I$(top_srcdir) $(CPPFLAGS) $(libcigma_la_cppflags) $(AM_CXXFLAGS) $(CXXFLAGS)" \
 	LDFLAGS="$(LDFLAGS) -L$$BUILD_DIR/.libs" \
 	ARCHFLAGS="$(ARCHFLAGS)" PYLIBS="$(PYLIBS)" \
 	$(PYTHON) src/py_cigma_setup.py build --build-lib=$$BUILD_DIR/ --build-temp=$$BUILD_DIR/pybuild -f)
@@ -409,7 +403,7 @@
 #
 if COND_BOOST_PYTHON
 pyexec_LTLIBRARIES = _cigma.la
-_cigma_la_DEPENDENCIES = libcigma.a libann.a
+_cigma_la_DEPENDENCIES = libcigma.la libann.la
 _cigma_la_SOURCES      = $(cigma_mod_sources)
 _cigma_la_CPPFLAGS     = $(cigma_mod_cppflags)
 _cigma_la_LDFLAGS      = $(cigma_mod_ldflags)
@@ -434,8 +428,8 @@
 cigma_mod_ldflags += $(PYTHON_LDFLAGS)
 
 cigma_mod_libs =
-cigma_mod_libs += libcigma.a
-cigma_mod_libs += libann.a
+cigma_mod_libs += libcigma.la
+cigma_mod_libs += libann.la
 cigma_mod_libs += $(BOOST_SYSTEM_LIB)
 cigma_mod_libs += $(BOOST_FILESYSTEM_LIB)
 cigma_mod_libs += $(BOOST_PROGRAM_OPTIONS_LIB)
@@ -492,8 +486,8 @@
 
 cigma_test_ldadd =
 cigma_test_ldadd += $(CPPUNIT_LIBS)
-cigma_test_ldadd += libcigma.a
-cigma_test_ldadd += libann.a
+cigma_test_ldadd += libcigma.la
+cigma_test_ldadd += libann.la
 cigma_test_ldadd += $(HDF5_LIBS)
 cigma_test_ldadd += $(VTK_LIBS)
 cigma_test_ldadd += $(BOOST_SYSTEM_LIB)