From 46667b9bd5210cb0c73b3625fa000c7421f8c5c2 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Tue, 1 Jun 2010 16:27:33 +0000
Subject: [PATCH] convert to standard Dune directory structure
[[Imported from SVN: r10505]]
---
Makefile.am | 2 +-
configure.ac | 2 ++
dune/Makefile.am | 5 +++++
dune/elasticity/Makefile.am | 6 ++++++
m4/dune-elasticity.m4 | 2 +-
5 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 dune/Makefile.am
create mode 100644 dune/elasticity/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 1008516..12e3d22 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ nonlinelast_SOURCES = nonlinelast.cc
viscoelast_SOURCES = viscoelast.cc
# Build the unit tests as well
-SUBDIRS = test m4
+SUBDIRS = test m4 dune
# don't follow the full GNU-standard
# we need automake 1.5
diff --git a/configure.ac b/configure.ac
index 8cde0c3..db1e234 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,8 @@ AC_SUBST(AM_LDFLAGS, $DUNE_LDFLAGS)
LIBS="$DUNE_LIBS"
AC_CONFIG_FILES([Makefile
+ dune/Makefile
+ dune/elasticity/Makefile
test/Makefile
m4/Makefile
elasticity.pc])
diff --git a/dune/Makefile.am b/dune/Makefile.am
new file mode 100644
index 0000000..6d23d00
--- /dev/null
+++ b/dune/Makefile.am
@@ -0,0 +1,5 @@
+# $Id: $
+
+SUBDIRS = elasticity
+
+include $(top_srcdir)/am/global-rules
diff --git a/dune/elasticity/Makefile.am b/dune/elasticity/Makefile.am
new file mode 100644
index 0000000..a3dd77c
--- /dev/null
+++ b/dune/elasticity/Makefile.am
@@ -0,0 +1,6 @@
+SUBDIRS =
+
+elasticitydir = $(includedir)/dune/elasticity
+elasticity_HEADERS = elasticityhelpers neohookeassembler.cc neohookeassembler.hh ogdenassembler.cc ogdenassembler.hh zienkiewiczzhuestimator.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/m4/dune-elasticity.m4 b/m4/dune-elasticity.m4
index 02d2b69..8d4e0f2 100644
--- a/m4/dune-elasticity.m4
+++ b/m4/dune-elasticity.m4
@@ -3,5 +3,5 @@ AC_DEFUN([DUNE_ELASTICITY_CHECKS],[
])
AC_DEFUN([DUNE_ELASTICITY_CHECK_MODULE],[
- DUNE_CHECK_MODULES([dune-elasticity], [dune-elasticity/elasticityhelpers.hh])
+ DUNE_CHECK_MODULES([dune-elasticity], [elasticity/elasticityhelpers.hh])
])
--
GitLab