Fix up after 2467a2d8584f0b7cd2961301f98d636f3a3d3acc

dune/tectonic/octave/duneoctave.hh

 /* -*- mode:c++; mode:semantic -*- */
 
-#ifndef DUNE_OCTAVE_HH
-#define DUNE_OCTAVE_HH
+#ifndef DUNE_TECTONIC_OCTAVE_DUNEOCTAVE_HH
+#define DUNE_TECTONIC_OCTAVE_DUNEOCTAVE_HH
 
 #include <octave/oct.h>
 
-#include "samplefunctional.hh"
+#include <dune/tectonic/samplefunctional.hh>
 
 #include <cassert>
 

src/Makefile.am

@@ -18,10 +18,7 @@ test_python_SOURCES = \
 	test-python.cc
 
 test_gradient_method_SOURCES = \
-	test-gradient-method.cc \
-	mynonlinearity.hh \
-	nicefunction.hh \
-	samplefunctional.hh
+	test-gradient-method.cc
 
 TESTS= test-python test-gradient-method
 
@@ -39,7 +36,8 @@ AM_CXXFLAGS = \
 AM_CPPFLAGS = \
 	$(DUNE_CPPFLAGS) \
 	$(ALUGRID_CPPFLAGS) \
-	$(PYTHON_CPPFLAGS)
+	$(PYTHON_CPPFLAGS) \
+	-I$(top_srcdir)
 
 # The libraries have to be given in reverse order (most basic libraries
 # last).  Also, due to some misunderstanding, a lot of libraries include the

src/duneevaluate.cc

@@ -6,8 +6,8 @@
 #include "config.h"
 #endif
 
-#include "samplefunctional.hh"
-#include "duneoctave.hh"
+#include <dune/tectonic/octave/duneoctave.hh>
+#include <dune/tectonic/samplefunctional.hh>
 
 #include <cassert>
 

src/duneminimise.cc

@@ -6,8 +6,8 @@
 #include "config.h"
 #endif
 
-#include "samplefunctional.hh"
-#include "duneoctave.hh"
+#include <dune/tectonic/octave/duneoctave.hh>
+#include <dune/tectonic/samplefunctional.hh>
 
 #include <cassert>
 

src/octave.mk

 $(OCTAVE_MODULES): %.oct: %.o
 	$(MKOCTFILE) -o $@ $< -ldunecommon
 
-$(OCTAVE_MODULES:.oct=.o): %.o: %.cc duneoctave.hh
+$(OCTAVE_MODULES:.oct=.o): %.o: %.cc
 	$(MKOCTFILE) $(DEFS) $(AM_CPPFLAGS) -c -o $@ $<
 
 CLEANFILES = $(OCTAVE_MODULES) $(OCTAVE_MODULES:.oct=.o)

src/one-body-sample.cc

@@ -35,8 +35,8 @@
 #include <exception>
 #include <iostream>
 
-#include "myconvexproblem.hh"
-#include "myblockproblem.hh"
+#include <dune/tectonic/myconvexproblem.hh>
+#include <dune/tectonic/myblockproblem.hh>
 
 int const dim = 2;
 

src/test-gradient-method.cc

@@ -7,7 +7,7 @@
 #include <dune/common/exceptions.hh>
 #include <dune/common/stdstreams.hh>
 
-#include "samplefunctional.hh"
+#include <dune/tectonic/samplefunctional.hh>
 
 #include <cassert>