From 2ba5af7dbc36ae238062d6fee5954de561fca49b Mon Sep 17 00:00:00 2001 From: Oliver Sander <sander@igpm.rwth-aachen.de> Date: Tue, 17 Jun 2014 15:01:45 +0000 Subject: [PATCH] Split the cosserat-continuum LDADD variable into LDADD and LDFLAGS [[Imported from SVN: r9791]] --- Makefile.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 165f9c86..932e320d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,9 +18,12 @@ noinst_PROGRAMS = cosserat-continuum rodobstacle rod3d harmonicmaps harmonicmaps cosserat_continuum_SOURCES = cosserat-continuum.cc cosserat_continuum_CXXFLAGS = $(UG_CPPFLAGS) $(AMIRAMESH_CPPFLAGS) $(IPOPT_CPPFLAGS) $(PSURFACE_CPPFLAGS) \ $(ADOLC_CPPFLAGS) $(PYTHON_CPPFLAGS) -cosserat_continuum_LDADD = $(UG_LDFLAGS) $(AMIRAMESH_LDFLAGS) $(UG_LIBS) $(AMIRAMESH_LIBS) \ - $(IPOPT_LDFLAGS) $(IPOPT_LIBS) $(PSURFACE_LDFLAGS) $(PSURFACE_LIBS) \ - $(ADOLC_LDFLAGS) $(ADOLC_LIBS) $(PYTHON_LDFLAGS) $(PYTHON_LIBS) +cosserat_continuum_LDADD = $(UG_LIBS) $(AMIRAMESH_LIBS) \ + $(IPOPT_LIBS) $(PSURFACE_LIBS) \ + $(ADOLC_LIBS) $(PYTHON_LIBS) +cosserat_continuum_LDFLAGS = $(UG_LDFLAGS) $(AMIRAMESH_LDFLAGS) \ + $(IPOPT_LDFLAGS) $(PSURFACE_LDFLAGS) \ + $(ADOLC_LDFLAGS) $(PYTHON_LDFLAGS) rodobstacle_SOURCES = rodobstacle.cc rod3d_SOURCES = rod3d.cc -- GitLab