From 999d8b789d1a8da2c6407ef5a8ef5fc794d22e74 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Sun, 21 Dec 2014 21:29:53 +0000
Subject: [PATCH] Move cosserat-continuum.cc into the src subdirectory
[[Imported from SVN: r9988]]
---
Makefile.am | 11 +----------
src/Makefile.am | 15 ++++++++++++++-
.../cosserat-continuum.cc | 0
3 files changed, 15 insertions(+), 11 deletions(-)
rename cosserat-continuum.cc => src/cosserat-continuum.cc (100%)
diff --git a/Makefile.am b/Makefile.am
index 109b4540..0d0037c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,19 +13,10 @@ ADOLC_CPPFLAGS = -I/home/sander/adolc-inst/include
ADOLC_LDFLAGS = -L/home/sander/adolc-inst/lib64
ADOLC_LIBS = -ladolc
-noinst_PROGRAMS = cosserat-continuum \
- finite-strain-elasticity \
+noinst_PROGRAMS = finite-strain-elasticity \
mixed-cosserat-continuum \
rodobstacle harmonicmaps harmonicmaps-eoc rod-eoc
-cosserat_continuum_SOURCES = cosserat-continuum.cc
-cosserat_continuum_CXXFLAGS = $(UG_CPPFLAGS) $(IPOPT_CPPFLAGS) \
- $(ADOLC_CPPFLAGS) $(PYTHON_CPPFLAGS)
-cosserat_continuum_LDADD = $(UG_LIBS) $(IPOPT_LIBS) \
- $(ADOLC_LIBS) $(PYTHON_LIBS)
-cosserat_continuum_LDFLAGS = $(UG_LDFLAGS) $(IPOPT_LDFLAGS) \
- $(ADOLC_LDFLAGS) $(PYTHON_LDFLAGS)
-
finite_strain_elasticity_SOURCES = finite-strain-elasticity.cc
finite_strain_elasticity_CXXFLAGS = $(UG_CPPFLAGS) $(IPOPT_CPPFLAGS) \
$(ADOLC_CPPFLAGS) $(PYTHON_CPPFLAGS) $(UMFPACK_CPPFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 8725a356..f3a7d224 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,20 @@
SUBDIRS =
-noinst_PROGRAMS = rod3d
+ADOLC_CPPFLAGS = -I/home/sander/adolc-inst/include
+ADOLC_LDFLAGS = -L/home/sander/adolc-inst/lib64
+ADOLC_LIBS = -ladolc
+
+noinst_PROGRAMS = cosserat-continuum \
+ rod3d
+
+cosserat_continuum_SOURCES = cosserat-continuum.cc
+cosserat_continuum_CXXFLAGS = $(UG_CPPFLAGS) $(IPOPT_CPPFLAGS) \
+ $(ADOLC_CPPFLAGS) $(PYTHON_CPPFLAGS)
+cosserat_continuum_LDADD = $(UG_LIBS) $(IPOPT_LIBS) \
+ $(ADOLC_LIBS) $(PYTHON_LIBS)
+cosserat_continuum_LDFLAGS = $(UG_LDFLAGS) $(IPOPT_LDFLAGS) \
+ $(ADOLC_LDFLAGS) $(PYTHON_LDFLAGS)
rod3d_SOURCES = rod3d.cc
rod3d_CXXFLAGS = $(IPOPT_CPPFLAGS)
diff --git a/cosserat-continuum.cc b/src/cosserat-continuum.cc
similarity index 100%
rename from cosserat-continuum.cc
rename to src/cosserat-continuum.cc
--
GitLab