From f1ff33e852e1e59a1b588e80f3054cb29927b72e Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Thu, 22 Apr 2010 15:16:44 +0000
Subject: [PATCH] update build system to new, Dune-conforming directory layout
[[Imported from SVN: r5936]]
---
Makefile.am | 2 +-
configure.ac | 5 +++--
dune/gfe/Makefile.am | 2 +-
m4/Makefile.am | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 1507982c..af8f434a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
# we need the module file to be able to build via dunecontrol
EXTRA_DIST=dune.module
-SUBDIRS = m4 src test
+SUBDIRS = m4 dune test
# possible options
LDADD = $(IPOPT_LDFLAGS) $(IPOPT_LIBS)
diff --git a/configure.ac b/configure.ac
index 7f2724a3..42fabec0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,10 +16,11 @@ AC_SUBST(AM_LDFLAGS, $DUNE_LDFLAGS)
LIBS="$DUNE_LIBS"
AC_CONFIG_FILES([Makefile
- src/Makefile
+ dune/Makefile
+ dune/gfe/Makefile
test/Makefile
m4/Makefile
- rods.pc
+ dune-gfe.pc
])
AC_OUTPUT
diff --git a/dune/gfe/Makefile.am b/dune/gfe/Makefile.am
index 36a2c8cd..2b218881 100644
--- a/dune/gfe/Makefile.am
+++ b/dune/gfe/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am 5716 2009-11-20 12:23:19Z dedner $
+# $Id: $
SUBDIRS =
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 0986fb22..535bde10 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,4 +1,4 @@
-ALLM4S = rods.m4
+ALLM4S = dune-gfe.m4
aclocaldir = $(datadir)/aclocal
aclocal_DATA = $(ALLM4S)
--
GitLab