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

[luis at geodynamics.org]

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

Modified:
   cs/cigma/trunk/Makefile.am
Log:
Updated Boost flags in Makefile.am

Modified: cs/cigma/trunk/Makefile.am
===================================================================
--- cs/cigma/trunk/Makefile.am	2008-12-10 02:16:04 UTC (rev 13613)
+++ cs/cigma/trunk/Makefile.am	2008-12-10 02:16:06 UTC (rev 13614)
@@ -80,6 +80,7 @@
 libcigma_a_CPPFLAGS =
 libcigma_a_CPPFLAGS += -Wno-deprecated
 libcigma_a_CPPFLAGS += $(LOGGER_FLAGS)
+libcigma_a_CPPFLAGS += $(BOOST_CPPFLAGS)
 libcigma_a_CPPFLAGS += $(ANN_FLAGS)
 libcigma_a_CPPFLAGS += $(HDF5_INCLUDES)
 libcigma_a_CPPFLAGS += $(VTK_INCLUDES)
@@ -204,14 +205,14 @@
 cigma_LDFLAGS += $(BOOST_LDFLAGS)
 cigma_LDFLAGS += $(HDF5_LDFLAGS)
 cigma_LDFLAGS += $(VTK_LDFLAGS)
+cigma_LDFLAGS += $(BOOST_FILESYSTEM_LIB)
+cigma_LDFLAGS += $(BOOST_PROGRAM_OPTIONS_LIB)
 
 cigma_LDADD =
 cigma_LDADD += libcigma.a
 cigma_LDADD += libann.a
 cigma_LDADD += $(HDF5_LIBS)
 cigma_LDADD += $(VTK_LIBS)
-cigma_LDFLAGS += $(BOOST_FILESYSTEM_LIB)
-cigma_LDFLAGS += $(BOOST_PROGRAM_OPTIONS_LIB)
 
 cigma_SOURCES = \
 	src/cli_application.h \
@@ -243,7 +244,7 @@
 
 h5attr_CPPFLAGS =
 h5attr_CPPFLAGS += $(LOGGER_FLAGS)
-h5attr_CPPFLAGS += $(BOOST_FLAGS)
+h5attr_CPPFLAGS += $(BOOST_CPPFLAGS)
 
 h5attr_LDADD =
 h5attr_LDADD += $(HDF5_LIBS)
@@ -365,6 +366,7 @@
 
 cigma_test_CXXFLAGS =
 cigma_test_CXXFLAGS += $(CPPUNIT_CFLAGS)
+cigma_test_CXXFLAGS += $(BOOST_CPPFLAGS)
 cigma_test_CXXFLAGS += $(ANN_FLAGS)
 cigma_test_CXXFLAGS += $(HDF5_INCLUDES)
 cigma_test_CXXFLAGS += $(VTK_INCLUDES)