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

Make $(LIBS) and $(FLIBS) the final libraries on link line.

Browse Source
This commit is contained in:
Bård Skaflestad 2011-12-19 18:31:57 +01:00
parent 81d804ca31
commit 6eb6054290
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
examples/Makefile.am
View File

@ -1,21 +1,21 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(BOOST_CPPFLAGS) $(BOOST_CPPFLAGS)
LDFLAGS = $(BOOST_LDFLAGS) LDFLAGS = $(BOOST_LDFLAGS)
LDADD = \ LDADD = \
$(top_builddir)/libopmcore.la \ $(top_builddir)/libopmcore.la \
$(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS) \ $(BOOST_FILESYSTEM_LIB) \
$(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)
noinst_PROGRAMS = \ noinst_PROGRAMS = \
scaneclipsedeck scaneclipsedeck
if UMFPACK if UMFPACK
noinst_PROGRAMS += spu_2p noinst_PROGRAMS += spu_2p
spu_2p_SOURCES = spu_2p.cpp spu_2p_SOURCES = spu_2p.cpp
endif endif

28
tests/Makefile.am
View File

@ -1,5 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(BOOST_CPPFLAGS) $(BOOST_CPPFLAGS)
LDFLAGS = $(BOOST_LDFLAGS) LDFLAGS = $(BOOST_LDFLAGS)
@ -7,19 +7,19 @@ LDFLAGS = $(BOOST_LDFLAGS)
LDADD = \ LDADD = \
$(top_builddir)/libopmcore.la \ $(top_builddir)/libopmcore.la \
$(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS) \ $(BOOST_FILESYSTEM_LIB) \
$(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)
noinst_PROGRAMS = \ noinst_PROGRAMS = \
monotcubicinterpolator_test \ monotcubicinterpolator_test \
param_test \ param_test \
sparsetable_test \ sparsetable_test \
sparsevector_test \ sparsevector_test \
unit_test \ unit_test \
test_readvector \ test_readvector \
test_sf2p test_sf2p
@ -32,7 +32,7 @@ test_readvector_SOURCES = test_readvector.cpp
test_sf2p_SOURCES = test_sf2p.cpp test_sf2p_SOURCES = test_sf2p.cpp
if UMFPACK if UMFPACK
noinst_PROGRAMS += test_cfs_tpfa noinst_PROGRAMS += test_cfs_tpfa
noinst_PROGRAMS += test_jacsys noinst_PROGRAMS += test_jacsys
test_jacsys_SOURCES = test_jacsys.cpp test_jacsys_SOURCES = test_jacsys.cpp
endif endif