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

[luis at geodynamics.org]

Author: luis
Date: 2008-12-09 18:15:36 -0800 (Tue, 09 Dec 2008)
New Revision: 13599

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

Modified: cs/cigma/trunk/Makefile.am
===================================================================
--- cs/cigma/trunk/Makefile.am	2008-12-10 02:15:34 UTC (rev 13598)
+++ cs/cigma/trunk/Makefile.am	2008-12-10 02:15:36 UTC (rev 13599)
@@ -82,8 +82,7 @@
 libcigma_a_CPPFLAGS += $(LOGGER_FLAGS)
 libcigma_a_CPPFLAGS += $(ANN_FLAGS)
 libcigma_a_CPPFLAGS += $(HDF5_INCLUDES)
-#libcigma_a_CPPFLAGS += $(HDF5_CXXFLAGS)
-#libcigma_a_CPPFLAGS += $(VTK_CXXFLAGS)
+libcigma_a_CPPFLAGS += $(VTK_INCLUDES)
 
 libcigma_a_SOURCES = \
 	src/nullstream.hpp \
@@ -203,18 +202,14 @@
 
 cigma_LDFLAGS =
 cigma_LDFLAGS += $(BOOST_LDFLAGS)
-#cigma_LDFLAGS += $(BOOST_FILESYSTEM_LDFLAGS)
-#cigma_LDFLAGS += $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
-#cigma_LDFLAGS += $(HDF5_LDFLAGS)
-#cigma_LDFLAGS += $(VTK_LDFLAGS)
+cigma_LDFLAGS += $(HDF5_LDFLAGS)
+cigma_LDFLAGS += $(VTK_LDFLAGS)
 
 cigma_LDADD =
 cigma_LDADD += libcigma.a
 cigma_LDADD += libann.a
-cigma_LDADD += $(HDF5_LIBS) -lhdf5_cpp		# XXX: fix this flag (integrate cpp lib)
-#cigma_LDADD += $(VTK_LIBS)
-#cigma_LDADD += $(BOOST_FILESYSTEM_LIBS)
-#cigma_LDADD += $(BOOST_PROGRAM_OPTIONS_LIBS)
+cigma_LDADD += $(HDF5_LIBS)
+cigma_LDADD += $(VTK_LIBS)
 cigma_LDFLAGS += $(BOOST_FILESYSTEM_LIB)
 cigma_LDFLAGS += $(BOOST_PROGRAM_OPTIONS_LIB)
 
@@ -251,7 +246,7 @@
 h5attr_CPPFLAGS += $(BOOST_FLAGS)
 
 h5attr_LDADD =
-h5attr_LDADD += $(HDF5_LIBS) -lhdf5_cpp	# XXX
+h5attr_LDADD += $(HDF5_LIBS)
 
 h5attr_LDFLAGS =
 h5attr_LDFLAGS += $(BOOST_FILESYSTEM_LIB)
@@ -369,17 +364,25 @@
 ## Compiler/Linker Options
 
 cigma_test_CXXFLAGS =
-cigma_test_CXXFLAGS += @CPPUNIT_CFLAGS@
+cigma_test_CXXFLAGS += $(CPPUNIT_CFLAGS)
 cigma_test_CXXFLAGS += $(ANN_FLAGS)
 cigma_test_CXXFLAGS += $(HDF5_INCLUDES)
+cigma_test_CXXFLAGS += $(VTK_INCLUDES)
 cigma_test_CXXFLAGS += -I$(top_srcdir)/src
 cigma_test_CXXFLAGS += -I$(top_srcdir)/tests
 
+cigma_test_LDFLAGS =
+cigma_test_LDFLAGS += $(BOOST_LDFLAGS)
+cigma_test_LDFLAGS += $(HDF5_LDFLAGS)
+cigma_test_LDFLAGS += $(VTK_LDFLAGS)
+
+
 cigma_test_LDADD =
-cigma_test_LDADD += @CPPUNIT_LIBS@
+cigma_test_LDADD += $(CPPUNIT_LIBS)
 cigma_test_LDADD += libcigma.a
 cigma_test_LDADD += libann.a
-cigma_test_LDADD += $(HDF5_LIBS) -lhdf5_cpp
+cigma_test_LDADD += $(HDF5_LIBS)
+cigma_test_LDADD += $(VTK_LIBS)
 cigma_test_LDADD += $(BOOST_FILESYSTEM_LIB)
 
 cigma_test_SOURCES = \