From fa5f97355a83eea354abc5dd773ea68a256a1a3e Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Wed, 14 Jan 2015 19:58:21 +0000
Subject: [PATCH] Split harmonicmaps_LDADD into LDADD proper and LDFLAGS
[[Imported from SVN: r10005]]
---
src/Makefile.am | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index da531dfb..0e9b9372 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,10 +20,12 @@ cosserat_continuum_LDFLAGS = $(UG_LDFLAGS) $(IPOPT_LDFLAGS) \
harmonicmaps_SOURCES = harmonicmaps.cc
harmonicmaps_CXXFLAGS = $(UG_CPPFLAGS) $(AMIRAMESH_CPPFLAGS) $(IPOPT_CPPFLAGS) $(PSURFACE_CPPFLAGS) \
$(ADOLC_CPPFLAGS) $(PYTHON_CPPFLAGS)
-harmonicmaps_LDADD = $(UG_LDFLAGS) $(AMIRAMESH_LDFLAGS) $(UG_LIBS) $(AMIRAMESH_LIBS) \
- $(IPOPT_LDFLAGS) $(IPOPT_LIBS) $(PSURFACE_LDFLAGS) $(PSURFACE_LIBS) \
- $(ADOLC_LIBS) $(PYTHON_LIBS) $(ADOLC_LDFLAGS) $(PYTHON_LDFLAGS)
-
+harmonicmaps_LDADD = $(UG_LIBS) $(AMIRAMESH_LIBS) \
+ $(IPOPT_LIBS) $(PSURFACE_LIBS) \
+ $(ADOLC_LIBS) $(PYTHON_LIBS)
+harmonicmaps_LDFLAGS = $(UG_LDFLAGS) $(AMIRAMESH_LDFLAGS) \
+ $(IPOPT_LDFLAGS) $(PSURFACE_LDFLAGS) \
+ $(ADOLC_LDFLAGS) $(PYTHON_LDFLAGS)
rod3d_SOURCES = rod3d.cc
rod3d_CXXFLAGS = $(IPOPT_CPPFLAGS)
--
GitLab