Move octave-related files to a subdir

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

src/Makefile.am

-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

src/octave/Makefile.am

+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