Remove extended "LDADD" variable. Links inferred from libopmcore.la .

This commit is contained in:
Bård Skaflestad 2012-06-06 14:42:36 +02:00
parent a097fde7c5
commit 15494cd88a

View File

@ -6,14 +6,6 @@ $(BOOST_CPPFLAGS)
# All targets link to the library
LDADD = $(top_builddir)/libopmcore.la
# Convenience make variable to avoid having to list the entire
# link-time dependency for every target that requires more than
# libopmcore.la
FULL_LDADD = \
$(LDADD) $(LIBS) \
$(BOOST_SYSTEM_LIB) $(BOOST_FILESYSTEM_LIB) \
$(LAPACK_LIBS) $(LIBS) $(LIBS)
# ----------------------------------------------------------------------
# Declare products (i.e., the example programs).
#
@ -33,15 +25,10 @@ wells_example
#
# Please maintain sort order from "noinst_PROGRAMS".
refine_wells_SOURCES = refine_wells.cpp
sim_2p_incomp_reorder_SOURCES = sim_2p_incomp_reorder.cpp
sim_2p_incomp_reorder_LDADD = $(FULL_LDADD)
sim_wateroil_SOURCES = sim_wateroil.cpp
sim_wateroil_LDADD = $(FULL_LDADD)
wells_example_SOURCES = wells_example.cpp
refine_wells_SOURCES = refine_wells.cpp
sim_2p_incomp_reorder_SOURCES = sim_2p_incomp_reorder.cpp
sim_wateroil_SOURCES = sim_wateroil.cpp
wells_example_SOURCES = wells_example.cpp
# ----------------------------------------------------------------------
# Optional examples, or examples that use optional add-on components.
@ -49,6 +36,5 @@ wells_example_SOURCES = wells_example.cpp
if UMFPACK
noinst_PROGRAMS += spu_2p
spu_2p_SOURCES = spu_2p.cpp
spu_2p_LDADD = $(FULL_LDADD)
spu_2p_SOURCES = spu_2p.cpp
endif