From ca55a9c2ccd7f0b52a1a8d79de316b3cd9fed23e Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Tue, 1 Nov 2011 00:51:53 +0100
Subject: [PATCH] Fix up after 2467a2d8584f0b7cd2961301f98d636f3a3d3acc

---
 dune/tectonic/octave/duneoctave.hh | 6 +++---
 src/Makefile.am                    | 8 +++-----
 src/duneevaluate.cc                | 4 ++--
 src/duneminimise.cc                | 4 ++--
 src/octave.mk                      | 2 +-
 src/one-body-sample.cc             | 4 ++--
 src/test-gradient-method.cc        | 2 +-
 7 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/dune/tectonic/octave/duneoctave.hh b/dune/tectonic/octave/duneoctave.hh
index 6857f2c2..902306a7 100644
--- a/dune/tectonic/octave/duneoctave.hh
+++ b/dune/tectonic/octave/duneoctave.hh
@@ -1,11 +1,11 @@
 /* -*- 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>
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 139922b2..708ae1a9 100644
--- a/src/Makefile.am
+++ b/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
diff --git a/src/duneevaluate.cc b/src/duneevaluate.cc
index a6cb3ac7..9db4a2f5 100644
--- a/src/duneevaluate.cc
+++ b/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>
 
diff --git a/src/duneminimise.cc b/src/duneminimise.cc
index 01ed5051..39ab3dd0 100644
--- a/src/duneminimise.cc
+++ b/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>
 
diff --git a/src/octave.mk b/src/octave.mk
index 673fbdcf..9d41dbdc 100644
--- a/src/octave.mk
+++ b/src/octave.mk
@@ -1,7 +1,7 @@
 $(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)
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 2d849a55..bd65ccb7 100644
--- a/src/one-body-sample.cc
+++ b/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;
 
diff --git a/src/test-gradient-method.cc b/src/test-gradient-method.cc
index 4c99a47e..92253a81 100644
--- a/src/test-gradient-method.cc
+++ b/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>
 
-- 
GitLab