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

[luis at geodynamics.org]

Author: luis
Date: 2008-12-09 18:14:24 -0800 (Tue, 09 Dec 2008)
New Revision: 13562

Modified:
   cs/cigma/trunk/Makefile.am
Log:
Updated Makefile.am to build h5attr

Modified: cs/cigma/trunk/Makefile.am
===================================================================
--- cs/cigma/trunk/Makefile.am	2008-12-10 02:14:22 UTC (rev 13561)
+++ cs/cigma/trunk/Makefile.am	2008-12-10 02:14:24 UTC (rev 13562)
@@ -17,11 +17,10 @@
 # Additional files to include in tarball
 EXTRA_DIST =
 
+# Main programs to build
+bin_PROGRAMS = cigma h5attr
 
-###############################################################################
-# Main source
-
-bin_PROGRAMS = cigma
+# Libraries
 lib_LTLIBRARIES =
 
 # Shared libraries (internal)
@@ -29,18 +28,18 @@
 noinst_LIBRARIES += libann.a
 noinst_LIBRARIES += libcigma.a
 
+# Include directory for ANN
+ANN_FLAGS = -I$(top_srcdir)/src/contrib/ann/include
 
-# Flags for cxxtl {{{
 # Select logging method for cxxtl
 #LOGGER_FLAGS = -DTLOG
 LOGGER_FLAGS = -DETLOG
 #LOGGER_FLAGS = -DFTLOG=cigma
-# }}}
 
-# libann.a library {{{
 
-# Include directory for ANN
-ANN_FLAGS = -I$(top_srcdir)/src/contrib/ann/include
+###############################################################################
+# libann.a library
+# {{{
 
 libann_a_CPPFLAGS = $(ANN_FLAGS)
 
@@ -74,7 +73,9 @@
 
 # }}}
 
-# libcigma.a library {{{
+###############################################################################
+# libcigma.a library
+# {{{
 
 libcigma_a_CPPFLAGS =
 libcigma_a_CPPFLAGS += -Wno-deprecated
@@ -187,8 +188,11 @@
 
 # }}}
 
-# cigma executable {{{
 
+###############################################################################
+# cigma executable
+# {{{
+
 cigma_CPPFLAGS =
 cigma_CPPFLAGS += -Wno-deprecated
 cigma_CPPFLAGS += $(LOGGER_FLAGS)
@@ -233,6 +237,29 @@
 
 #EXTRA_DIST +=
 
+# }}} 
+
+
+###############################################################################
+# Utilities
+# {{{
+
+h5attr_CPPFLAGS =
+h5attr_CPPFLAGS += $(LOGGER_FLAGS)
+h5attr_CPPFLAGS += $(BOOST_FLAGS)
+
+h5attr_LDADD =
+h5attr_LDADD += $(HDF5_LIBS) -lhdf5_cpp	# XXX
+
+h5attr_LDFLAGS =
+h5attr_LDFLAGS += $(BOOST_FILESYSTEM_LIB)
+h5attr_LDFLAGS += $(BOOST_PROGRAM_OPTIONS_LIB)
+
+h5attr_SOURCES = \
+	src/tri_logger.hpp \
+	src/tri_logger.cpp \
+	src/h5attr.cpp
+
 # }}}
 
 
@@ -244,8 +271,7 @@
 ##libpycigma_la_CPPFLAGS = $(libcigma_a_CPPFLAGS) $(PYTHON_INCLUDE_DIR)
 
 # XXX: uncomment
-###pyexec_PROGRAMS = _cigma.so
-pyexec_PROGRAMS = _cigma.so
+#pyexec_PROGRAMS = _cigma.so
 
 # _cigma.so extension {{{