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

[luis at geodynamics.org]

Author: luis
Date: 2008-12-17 02:31:46 -0800 (Wed, 17 Dec 2008)
New Revision: 13710

Modified:
   cs/cigma/trunk/Makefile.am
Log:
Fix linking problem with HDF5

This was triggered when trying to use a different HDF5 prefix,
while having another version installed under /usr

Modified: cs/cigma/trunk/Makefile.am
===================================================================
--- cs/cigma/trunk/Makefile.am	2008-12-17 10:31:42 UTC (rev 13709)
+++ cs/cigma/trunk/Makefile.am	2008-12-17 10:31:46 UTC (rev 13710)
@@ -31,7 +31,7 @@
 # libcigma.la
 libcigma_la_SOURCES  = $(libcigma_la_sources)
 libcigma_la_CPPFLAGS = $(libcigma_la_cppflags)
-libcigma_la_LDFLAGS  = -static
+libcigma_la_LDFLAGS  = -static $(libcigma_la_ldflags)
 
 # cigma
 cigma_SOURCES  = $(cigma_sources)
@@ -209,12 +209,16 @@
 
 libcigma_la_cppflags =
 libcigma_la_cppflags += -Wno-deprecated
+libcigma_la_cppflags += $(HDF5_INCLUDES)
+libcigma_la_cppflags += $(VTK_INCLUDES)
 libcigma_la_cppflags += $(LOGGER_FLAGS)
 libcigma_la_cppflags += $(BOOST_CPPFLAGS)
 libcigma_la_cppflags += $(ANN_FLAGS)
 
-#if COND_HDF5
-libcigma_la_cppflags += $(HDF5_INCLUDES)
+libcigma_la_ldflags =
+libcigma_la_ldflags += $(HDF5_LDFLAGS)
+libcigma_la_ldflags += $(VTK_LDFLAGS)
+
 libcigma_la_sources  += \
 	src/io_hdf5.h \
 	src/io_hdf5.cpp \
@@ -222,10 +226,7 @@
 	src/io_hdf5_reader.cpp \
 	src/io_hdf5_writer.h \
 	src/io_hdf5_writer.cpp
-#endif
 
-#if COND_VTK
-libcigma_la_cppflags += $(VTK_INCLUDES)
 libcigma_la_sources  += \
 	src/io_vtk.h \
 	src/io_vtk.cpp \
@@ -233,7 +234,6 @@
 	src/io_vtk_reader.cpp \
 	src/io_vtk_writer.h \
 	src/io_vtk_writer.cpp
-#endif
 
 # }}}
 
@@ -268,25 +268,20 @@
 cigma_cppflags += $(ANN_FLAGS)
 
 cigma_ldflags =
+cigma_ldflags += $(HDF5_LDFLAGS)
+cigma_ldflags += $(VTK_LDFLAGS)
 cigma_ldflags += $(BOOST_LDFLAGS)
 
 cigma_ldadd =
+cigma_ldadd += $(HDF5_LIBS)
+cigma_ldadd += $(VTK_LIBS)
 cigma_ldadd += $(BOOST_SYSTEM_LIB)
 cigma_ldadd += $(BOOST_FILESYSTEM_LIB)
 cigma_ldadd += $(BOOST_PROGRAM_OPTIONS_LIB)
 cigma_ldadd += libcigma.la
 cigma_ldadd += libann.la
 
-#if COND_HDF5
-cigma_ldflags += $(HDF5_LDFLAGS)
-cigma_ldadd   += $(HDF5_LIBS)
-#endif
 
-#if COND_VTK
-cigma_ldflags += $(VTK_LDFLAGS)
-cigma_ldadd   += $(VTK_LIBS)
-#endif
-
 # }}} 
 
 
@@ -295,9 +290,9 @@
 # {{{
 
 h5attr_cppflags =
-h5attr_cppflags += $(LOGGER_FLAGS)
-h5attr_cppflags += $(BOOST_CPPFLAGS)
 h5attr_cppflags += $(HDF5_INCLUDES)
+h5attr_cppflags += $(BOOST_CPPFLAGS)
+h5attr_cppflags += $(LOGGER_FLAGS)
 
 h5attr_ldadd =
 h5attr_ldadd += $(HDF5_LIBS)
@@ -306,8 +301,8 @@
 h5attr_ldadd += $(BOOST_PROGRAM_OPTIONS_LIB)
 
 h5attr_ldflags =
-h5attr_ldflags += $(BOOST_LDFLAGS)
 h5attr_ldflags += $(HDF5_LDFLAGS)
+h5attr_ldflags += $(BOOST_LDFLAGS)
 
 h5attr_sources = \
 	src/tri_logger.hpp \