From 82d7d2b0a295615023939b800690d031a9eccbd4 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Wed, 2 Nov 2011 21:11:51 +0100
Subject: [PATCH] Move octave-related files to a subdir
---
configure.ac | 1 +
src/Makefile.am | 15 +--------------
src/octave/Makefile.am | 18 ++++++++++++++++++
src/{ => octave}/curve.m | 0
src/{ => octave}/duneevaluate.cc | 0
src/{ => octave}/duneminimise.cc | 0
src/{ => octave}/octave.mk | 0
src/{ => octave}/zigzag.m | 0
8 files changed, 20 insertions(+), 14 deletions(-)
create mode 100644 src/octave/Makefile.am
rename src/{ => octave}/curve.m (100%)
rename src/{ => octave}/duneevaluate.cc (100%)
rename src/{ => octave}/duneminimise.cc (100%)
rename src/{ => octave}/octave.mk (100%)
rename src/{ => octave}/zigzag.m (100%)
diff --git a/configure.ac b/configure.ac
index 2b9aeb04..effbc6d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,7 @@ LIBS="$DUNE_LIBS"
AC_CONFIG_FILES([
Makefile
src/Makefile
+ src/octave/Makefile
doc/Makefile
doc/doxygen/Makefile
doc/doxygen/Doxyfile
diff --git a/src/Makefile.am b/src/Makefile.am
index c62a8dc9..1a32ffaa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS =
+SUBDIRS = octave
check_PROGRAMS = \
test-python \
@@ -64,16 +64,3 @@ DISTCHECK_CONFIGURE_FLAGS = --with-dune-common=$(DUNE_COMMON_ROOT) --with-dune-f
include $(top_srcdir)/am/global-rules
include $(top_srcdir)/flymake.mk
-
-## Octave
-
-MKOCTFILE ?= mkoctfile
-OCTAVE ?= octave
-
-OCTAVE_MODULES= duneminimise.oct duneevaluate.oct
-
-.PHONY: run-octave
-run-octave: $(OCTAVE_MODULES)
- $(OCTAVE) --path $(abs_builddir) --path $(abs_srcdir)
-
-include $(srcdir)/octave.mk
diff --git a/src/octave/Makefile.am b/src/octave/Makefile.am
new file mode 100644
index 00000000..977ad9d8
--- /dev/null
+++ b/src/octave/Makefile.am
@@ -0,0 +1,18 @@
+SUBDIRS =
+
+AM_CPPFLAGS = \
+ $(DUNE_CPPFLAGS) \
+ -I$(top_srcdir)
+
+## Octave
+
+MKOCTFILE ?= mkoctfile
+OCTAVE ?= octave
+
+OCTAVE_MODULES= duneminimise.oct duneevaluate.oct
+
+.PHONY: run-octave
+run-octave: $(OCTAVE_MODULES)
+ $(OCTAVE) --path $(abs_builddir) --path $(abs_srcdir)
+
+include $(srcdir)/octave.mk
diff --git a/src/curve.m b/src/octave/curve.m
similarity index 100%
rename from src/curve.m
rename to src/octave/curve.m
diff --git a/src/duneevaluate.cc b/src/octave/duneevaluate.cc
similarity index 100%
rename from src/duneevaluate.cc
rename to src/octave/duneevaluate.cc
diff --git a/src/duneminimise.cc b/src/octave/duneminimise.cc
similarity index 100%
rename from src/duneminimise.cc
rename to src/octave/duneminimise.cc
diff --git a/src/octave.mk b/src/octave/octave.mk
similarity index 100%
rename from src/octave.mk
rename to src/octave/octave.mk
diff --git a/src/zigzag.m b/src/octave/zigzag.m
similarity index 100%
rename from src/zigzag.m
rename to src/octave/zigzag.m
--
GitLab