OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6 from bska/master

Browse Source 
Fix Fall-out From Build-System Boost-Library Clean-up
This commit is contained in:
Bård Skaflestad 2012-07-10 05:07:30 -07:00
commit bf278f8d13
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

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

2
examples/Makefile.am
View File

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

4
tests/Makefile.am
View File

@ -2,7 +2,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(OPM_BOOST_CPPFLAGS) $(OPM_BOOST_CPPFLAGS)
LDFLAGS = $(OPM_BOOST_LDFLAGS) AM_LDFLAGS = $(OPM_BOOST_LDFLAGS)
LDADD = $(top_builddir)/lib/libopmcore.la 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_column_extract_LDADD = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
test_lapack_SOURCES = test_lapack.cpp 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_readpolymer_SOURCES = test_readpolymer.cpp
test_read_vag_SOURCES = test_read_vag.cpp test_read_vag_SOURCES = test_read_vag.cpp

2
tutorials/Makefile.am
View File

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