Merge pull request #62 from rolk/master

Add needed/remove unneeded linker dependencies

.gitignore

@@ -35,6 +35,7 @@ tutorials/tutorial[1-4]
 
 # Ignoring executables
 *_test
+examples/compute_tof
 examples/scaneclipsedeck
 examples/spu_2p
 examples/reorder-qfs
@@ -56,4 +57,5 @@ tests/test_column_extract
 tests/test_lapack
 tests/test_read_vag
 tests/test_readpolymer
+tests/test_wells
 tests/test_writeVtkData

examples/Makefile.am

@@ -1,13 +1,11 @@
 # Build-time flags needed to form example programs
 AM_CPPFLAGS =					\
 -I$(top_srcdir)					\
-$(OPM_BOOST_CPPFLAGS)                           \
-${SUPERLU_CPPFLAGS}
+$(OPM_BOOST_CPPFLAGS)
 
 # All targets link to the library
 LDADD =						\
-$(top_builddir)/lib/libopmcore.la               \
-$(SUPERLU_LIBS) $(BLAS_LIBS) $(LIBS)
+$(top_builddir)/lib/libopmcore.la
 
 # Convenience definition for targets that use Boost.Filesystem directly.
 # While libopmcore depends on (and references) Boost.Filesystem (through
@@ -45,6 +43,7 @@ wells_example
 # Please maintain sort order from "noinst_PROGRAMS".
 
 compute_tof_SOURCES           = compute_tof.cpp
+compute_tof_LDADD             = $(LDADD) $(LINK_BOOST_FILESYSTEM)
 refine_wells_SOURCES          = refine_wells.cpp
 
 sim_2p_comp_reorder_SOURCES   = sim_2p_comp_reorder.cpp

tutorials/Makefile.am

@@ -1,10 +1,8 @@
 AM_CPPFLAGS =					\
 -I$(top_srcdir)					\
-$(OPM_BOOST_CPPFLAGS)                           \
-${SUPERLU_CPPFLAGS}
+$(OPM_BOOST_CPPFLAGS)
 
-AM_LDFLAGS = $(OPM_BOOST_LDFLAGS)               \
-${SUPERLU_LIBS} $(BLAS_LIBS) $(LIBS)
+AM_LDFLAGS = $(OPM_BOOST_LDFLAGS)
 
 LDADD =	$(top_builddir)/lib/libopmcore.la