From 2c93e80736024fa823a369884013c0a053aad46b Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Mon, 8 Dec 2014 15:42:21 +0000
Subject: [PATCH] Move application program 'rod3d' to the new 'src' directory
[[Imported from SVN: r9982]]
---
Makefile.am | 1 -
configure.ac | 2 +-
src/Makefile.am | 7 ++++++-
rod3d.cc => src/rod3d.cc | 0
4 files changed, 7 insertions(+), 3 deletions(-)
rename rod3d.cc => src/rod3d.cc (100%)
diff --git a/Makefile.am b/Makefile.am
index 79d5162a..4efaec44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,6 @@ mixed_cosserat_continuum_LDFLAGS = $(UG_LDFLAGS) $(IPOPT_LDFLAGS) \
$(ADOLC_LDFLAGS) $(PYTHON_LDFLAGS)
rodobstacle_SOURCES = rodobstacle.cc
-rod3d_SOURCES = rod3d.cc
rod_eoc_SOURCES = rod-eoc.cc
diff --git a/configure.ac b/configure.ac
index 4254df6a..fdc37ce4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
AC_PREREQ(2.50)
DUNE_AC_INIT
AM_INIT_AUTOMAKE
-AC_CONFIG_SRCDIR([rod3d.cc])
+AC_CONFIG_SRCDIR([src/rod3d.cc])
AM_CONFIG_HEADER([config.h])
# we need no more than the standard DUNE-stuff
diff --git a/src/Makefile.am b/src/Makefile.am
index 248bbfd7..8725a356 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,12 @@
SUBDIRS =
-noinst_PROGRAMS =
+noinst_PROGRAMS = rod3d
+
+rod3d_SOURCES = rod3d.cc
+rod3d_CXXFLAGS = $(IPOPT_CPPFLAGS)
+rod3d_LDADD = $(IPOPT_LIBS)
+rod3d_LDFLAGS = $(IPOPT_LDFLAGS)
# we need automake 1.5
AUTOMAKE_OPTIONS = foreign 1.5
diff --git a/rod3d.cc b/src/rod3d.cc
similarity index 100%
rename from rod3d.cc
rename to src/rod3d.cc
--
GitLab