From b9dae84847bfc259f2406652de990b4865a5441d Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Mon, 8 Dec 2014 15:32:27 +0000
Subject: [PATCH] Make new subdirectory 'src' for all executable programs
[[Imported from SVN: r9981]]
---
Makefile.am | 2 +-
configure.ac | 1 +
src/Makefile.am | 13 +++++++++++++
3 files changed, 15 insertions(+), 1 deletion(-)
create mode 100644 src/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 9d3f74c2..79d5162a 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 = doc m4 dune test
+SUBDIRS = doc m4 dune src test
# possible options
LDADD = $(IPOPT_LDFLAGS) $(IPOPT_LIBS)
diff --git a/configure.ac b/configure.ac
index aa322e4b..4254df6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,7 @@ AC_CONFIG_FILES([Makefile
dune/Makefile
dune/gfe/Makefile
dune/gfe/coupling/Makefile
+ src/Makefile
test/Makefile
m4/Makefile
dune-gfe.pc
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 00000000..248bbfd7
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,13 @@
+
+SUBDIRS =
+
+noinst_PROGRAMS =
+
+# we need automake 1.5
+AUTOMAKE_OPTIONS = foreign 1.5
+
+# pass most important options when "make distcheck" is used
+DISTCHECK_CONFIGURE_FLAGS = --with-dune-common=$(DUNE_COMMON_ROOT) --with-dune-geometry=$(DUNE_GEOMETRY_ROOT) --with-dune-grid=$(DUNE_GRID_ROOT) --with-dune-istl=$(DUNE_ISTL_ROOT) --with-dune-localfunctions=$(DUNE_LOCALFUNCTIONS_ROOT) CXX="$(CXX)" CC="$(CC)"
+
+include $(top_srcdir)/am/global-rules
+
--
GitLab