From d221eecbcf3d2f4ad9772608e3762d82056850fc Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Wed, 14 Jan 2015 15:26:30 +0000
Subject: [PATCH] Move harmonicmaps.cc from dune-gfe to dune-gfe/src
[[Imported from SVN: r9998]]
---
Makefile.am | 7 +------
src/Makefile.am | 6 ++++++
harmonicmaps.cc => src/harmonicmaps.cc | 0
3 files changed, 7 insertions(+), 6 deletions(-)
rename harmonicmaps.cc => src/harmonicmaps.cc (100%)
diff --git a/Makefile.am b/Makefile.am
index 0d0037c7..c066ea53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ ADOLC_LIBS = -ladolc
noinst_PROGRAMS = finite-strain-elasticity \
mixed-cosserat-continuum \
- rodobstacle harmonicmaps harmonicmaps-eoc rod-eoc
+ rodobstacle harmonicmaps-eoc rod-eoc
finite_strain_elasticity_SOURCES = finite-strain-elasticity.cc
finite_strain_elasticity_CXXFLAGS = $(UG_CPPFLAGS) $(IPOPT_CPPFLAGS) \
@@ -37,11 +37,6 @@ rodobstacle_SOURCES = rodobstacle.cc
rod_eoc_SOURCES = rod-eoc.cc
-harmonicmaps_SOURCES = harmonicmaps.cc
-harmonicmaps_CXXFLAGS = $(UG_CPPFLAGS) $(AMIRAMESH_CPPFLAGS) $(IPOPT_CPPFLAGS) $(PSURFACE_CPPFLAGS)
-harmonicmaps_LDADD = $(UG_LDFLAGS) $(AMIRAMESH_LDFLAGS) $(UG_LIBS) $(AMIRAMESH_LIBS) \
- $(IPOPT_LDFLAGS) $(IPOPT_LIBS) $(PSURFACE_LDFLAGS) $(PSURFACE_LIBS)
-
harmonicmaps_eoc_SOURCES = harmonicmaps-eoc.cc
harmonicmaps_eoc_CXXFLAGS = $(UG_CPPFLAGS) $(AMIRAMESH_CPPFLAGS) $(IPOPT_CPPFLAGS) $(PSURFACE_CPPFLAGS)
harmonicmaps_eoc_LDADD = $(UG_LDFLAGS) $(AMIRAMESH_LDFLAGS) $(UG_LIBS) $(AMIRAMESH_LIBS) \
diff --git a/src/Makefile.am b/src/Makefile.am
index f3a7d224..22912c6c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,7 @@ ADOLC_LDFLAGS = -L/home/sander/adolc-inst/lib64
ADOLC_LIBS = -ladolc
noinst_PROGRAMS = cosserat-continuum \
+ harmonicmaps \
rod3d
cosserat_continuum_SOURCES = cosserat-continuum.cc
@@ -16,6 +17,11 @@ cosserat_continuum_LDADD = $(UG_LIBS) $(IPOPT_LIBS) \
cosserat_continuum_LDFLAGS = $(UG_LDFLAGS) $(IPOPT_LDFLAGS) \
$(ADOLC_LDFLAGS) $(PYTHON_LDFLAGS)
+harmonicmaps_SOURCES = harmonicmaps.cc
+harmonicmaps_CXXFLAGS = $(UG_CPPFLAGS) $(AMIRAMESH_CPPFLAGS) $(IPOPT_CPPFLAGS) $(PSURFACE_CPPFLAGS)
+harmonicmaps_LDADD = $(UG_LDFLAGS) $(AMIRAMESH_LDFLAGS) $(UG_LIBS) $(AMIRAMESH_LIBS) \
+ $(IPOPT_LDFLAGS) $(IPOPT_LIBS) $(PSURFACE_LDFLAGS) $(PSURFACE_LIBS)
+
rod3d_SOURCES = rod3d.cc
rod3d_CXXFLAGS = $(IPOPT_CPPFLAGS)
rod3d_LDADD = $(IPOPT_LIBS)
diff --git a/harmonicmaps.cc b/src/harmonicmaps.cc
similarity index 100%
rename from harmonicmaps.cc
rename to src/harmonicmaps.cc
--
GitLab