Merge pull request #6 from bska/master

Fix Fall-out From Build-System Boost-Library Clean-up

Makefile.am

@@ -24,7 +24,7 @@ $(BOOST_FILESYSTEM_LIB)				\
 $(BOOST_SYSTEM_LIB)				\
 $(BOOST_DATE_TIME_LIB)				\
 $(BOOST_UNIT_TEST_FRAMEWORK_LIB)		\
-$(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS)
+$(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS)
 
 # ----------------------------------------------------------------------
 # Library constituents.  SOURCES followed by HEADERS.

examples/Makefile.am

@@ -42,5 +42,5 @@ noinst_PROGRAMS += spu_2p
 spu_2p_SOURCES   = spu_2p.cpp
 spu_2p_LDADD     =				\
 $(LDADD)					\
-$(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS)
+$(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS)
 endif

tests/Makefile.am

@@ -2,7 +2,7 @@ AM_CPPFLAGS =					\
 -I$(top_srcdir)					\
 $(OPM_BOOST_CPPFLAGS)
 
-LDFLAGS = $(OPM_BOOST_LDFLAGS)
+AM_LDFLAGS = $(OPM_BOOST_LDFLAGS)
 
 
 LDADD =	$(top_builddir)/lib/libopmcore.la
@@ -43,7 +43,7 @@ test_column_extract_SOURCES = test_column_extract.cpp
 test_column_extract_LDADD = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
 
 test_lapack_SOURCES       = test_lapack.cpp
-test_lapack_LDADD         = $(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS)
+test_lapack_LDADD         = $(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS)
 
 test_readpolymer_SOURCES  = test_readpolymer.cpp
 test_read_vag_SOURCES     = test_read_vag.cpp

tutorials/Makefile.am

@@ -2,7 +2,7 @@ AM_CPPFLAGS =					\
 -I$(top_srcdir)					\
 $(OPM_BOOST_CPPFLAGS)
 
-LDFLAGS = $(OPM_BOOST_LDFLAGS)
+AM_LDFLAGS = $(OPM_BOOST_LDFLAGS)
 
 LDADD =	$(top_builddir)/lib/libopmcore.la