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

Refactor full "LDADD" statement out to single make variable.

Browse Source 
Use where appropriate.
This commit is contained in:
Bård Skaflestad 2012-06-06 14:07:03 +02:00
parent 7207ea27c9
commit 49641f935d
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
examples/Makefile.am
View File

@ -4,6 +4,13 @@ $(BOOST_CPPFLAGS)
LDADD = $(top_builddir)/libopmcore.la LDADD = $(top_builddir)/libopmcore.la
FULL_LDADD = \
$(LDADD) $(LIBS) \
$(BOOST_SYSTEM_LIB) $(BOOST_FILESYSTEM_LIB) \
$(LAPACK_LIBS) $(LIBS) $(LIBS)
noinst_PROGRAMS = \ noinst_PROGRAMS = \
refine_wells \ refine_wells \
scaneclipsedeck \ scaneclipsedeck \
@ -14,16 +21,10 @@ sim_2p_incomp_reorder
refine_wells_SOURCES = refine_wells.cpp refine_wells_SOURCES = refine_wells.cpp
sim_wateroil_SOURCES = sim_wateroil.cpp sim_wateroil_SOURCES = sim_wateroil.cpp
sim_wateroil_LDADD = \ sim_wateroil_LDADD = $(FULL_LDADD)
$(LDADD) $(LIBS) \
$(BOOST_SYSTEM_LIB) $(BOOST_FILESYSTEM_LIB) \
$(LAPACK_LIBS) $(LIBS) $(LIBS)
sim_2p_incomp_reorder_SOURCES = sim_2p_incomp_reorder.cpp sim_2p_incomp_reorder_SOURCES = sim_2p_incomp_reorder.cpp
sim_2p_incomp_reorder_LDADD = \ sim_2p_incomp_reorder_LDADD = $(FULL_LDADD)
$(LDADD) $(LIBS) \
$(BOOST_SYSTEM_LIB) $(BOOST_FILESYSTEM_LIB) \
$(LAPACK_LIBS) $(LIBS) $(LIBS)
wells_example_SOURCES = wells_example.cpp wells_example_SOURCES = wells_example.cpp
@ -31,8 +32,5 @@ if UMFPACK
noinst_PROGRAMS += spu_2p noinst_PROGRAMS += spu_2p
spu_2p_SOURCES = spu_2p.cpp spu_2p_SOURCES = spu_2p.cpp
spu_2p_LDADD = \ spu_2p_LDADD = $(FULL_LDADD)
$(LDADD) $(LIBS) \
$(BOOST_SYSTEM_LIB) $(BOOST_FILESYSTEM_LIB) \
$(LAPACK_LIBS) $(LIBS) $(LIBS)
endif endif