From 8bb15b1dd0927add217ff8ff4ef4e002dc49bff3 Mon Sep 17 00:00:00 2001
From: Gert van Valkenhoef <g.h.m.van.valkenhoef@rug.nl>
Date: Tue, 15 Nov 2011 15:12:54 +0000
Subject: [PATCH] Get rid of per-module -I

---
 Makefile                     |  2 +-
 alien/alien.cc               |  2 +-
 alien/alien.h                |  6 +++---
 fold/fold.cc                 |  4 ++--
 fold/fold.h                  |  6 +++---
 reader/oberon.h => oberon.h  |  0
 odcread.cc                   | 10 +++++-----
 reader/reader.cc             |  4 ++--
 reader/reader.h              |  6 +++---
 reader/util.cc               |  2 +-
 store/store.cc               |  6 +++---
 store/store.h                |  8 ++++----
 textmodel/textmodel.cc       |  4 ++--
 textmodel/textmodel.h        |  6 +++---
 typeregister/typeregister.cc |  2 +-
 typeregister/typeregister.h  |  3 ++-
 16 files changed, 36 insertions(+), 35 deletions(-)
 rename reader/oberon.h => oberon.h (100%)

diff --git a/Makefile b/Makefile
index 94be64a..90f9d3d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 MODULES := reader store alien typeregister textmodel fold
 
 # Add module directories to the include path
-CFLAGS += -I. $(patsubst %,-I%,$(MODULES))
+CFLAGS += -I.
 
 # Variables for the modules to write to
 SRCS := odcread.cc
diff --git a/alien/alien.cc b/alien/alien.cc
index dc4f509..38c70bd 100644
--- a/alien/alien.cc
+++ b/alien/alien.cc
@@ -1,4 +1,4 @@
-#include <alien.h>
+#include "alien/alien.h"
 
 namespace odc {
 
diff --git a/alien/alien.h b/alien/alien.h
index 77db1fe..5cc1262 100644
--- a/alien/alien.h
+++ b/alien/alien.h
@@ -1,9 +1,9 @@
 #ifndef _ALIEN_H_
 #define _ALIEN_H_
 
-#include <oberon.h>
-#include <store.h>
-#include <visitor.h>
+#include "oberon.h"
+#include "store/store.h"
+#include "visitor/visitor.h"
 #include <iostream>
 #include <vector>
 #include <string>
diff --git a/fold/fold.cc b/fold/fold.cc
index b88d24b..7fdf01b 100644
--- a/fold/fold.cc
+++ b/fold/fold.cc
@@ -1,5 +1,5 @@
-#include <fold.h>
-#include <reader.h>
+#include "fold/fold.h"
+#include "reader/reader.h"
 
 namespace odc {
 
diff --git a/fold/fold.h b/fold/fold.h
index e8c78b7..3725b47 100644
--- a/fold/fold.h
+++ b/fold/fold.h
@@ -1,9 +1,9 @@
 #ifndef _FOLD_H_
 #define _FOLD_H_
 
-#include <oberon.h>
-#include <typeregister.h>
-#include <store.h>
+#include "oberon.h"
+#include "typeregister/typeregister.h"
+#include "store/store.h"
 
 namespace odc {
 
diff --git a/reader/oberon.h b/oberon.h
similarity index 100%
rename from reader/oberon.h
rename to oberon.h
diff --git a/odcread.cc b/odcread.cc
index d2aa025..a509ab6 100644
--- a/odcread.cc
+++ b/odcread.cc
@@ -3,11 +3,11 @@
 #include <string>
 #include <stack>
 
-#include <oberon.h>
-#include <reader.h>
-#include <store.h>
-#include <textmodel.h>
-#include <visitor.h>
+#include "oberon.h"
+#include "reader/reader.h"
+#include "store/store.h"
+#include "textmodel/textmodel.h"
+#include "visitor/visitor.h"
 
 // Character encoding conversions
 #include <langinfo.h> // determine the current charset
diff --git a/reader/reader.cc b/reader/reader.cc
index ffca53d..9f3402c 100644
--- a/reader/reader.cc
+++ b/reader/reader.cc
@@ -1,5 +1,5 @@
-#include <reader.h>
-#include <alien.h>
+#include "reader/reader.h"
+#include "alien/alien.h"
 
 #include <string>
 #include <assert.h>
diff --git a/reader/reader.h b/reader/reader.h
index e59f36c..b7becc0 100644
--- a/reader/reader.h
+++ b/reader/reader.h
@@ -4,9 +4,9 @@
 #include <iostream>
 #include <vector>
 
-#include <oberon.h>
-#include <store.h>
-#include <alien.h>
+#include "oberon.h"
+#include "store/store.h"
+#include "alien/alien.h"
 
 namespace odc {
 
diff --git a/reader/util.cc b/reader/util.cc
index 4f4b6c0..31befb7 100644
--- a/reader/util.cc
+++ b/reader/util.cc
@@ -1,4 +1,4 @@
-#include <oberon.h>
+#include "oberon.h"
 
 namespace odc {
 	bool isBigEndian() { // http://stackoverflow.com/questions/1001307/detecting-endianness-programmatically-in-a-c-program
diff --git a/store/store.cc b/store/store.cc
index 6f44e85..c85d831 100644
--- a/store/store.cc
+++ b/store/store.cc
@@ -1,6 +1,6 @@
-#include <store.h>
-#include <reader.h>
-#include <visitor.h>
+#include "store/store.h"
+#include "reader/reader.h"
+#include "visitor/visitor.h"
 
 #include <iostream>
 
diff --git a/store/store.h b/store/store.h
index 03d1c8f..5743cb0 100644
--- a/store/store.h
+++ b/store/store.h
@@ -1,13 +1,13 @@
 #ifndef _STORE_H_
 #define _STORE_H_
 
-#include <oberon.h>
-#include <typeregister.h>
-#include <visitor.h>
-
 #include <string>
 #include <vector>
 
+#include "oberon.h"
+#include "typeregister/typeregister.h"
+#include "visitor/visitor.h"
+
 namespace odc {
 	class Reader; // forward decl
 
diff --git a/textmodel/textmodel.cc b/textmodel/textmodel.cc
index 7afc34c..720654a 100644
--- a/textmodel/textmodel.cc
+++ b/textmodel/textmodel.cc
@@ -1,5 +1,5 @@
-#include <textmodel.h>
-#include <reader.h>
+#include "textmodel/textmodel.h"
+#include "reader/reader.h"
 
 #include <vector>
 #include <assert.h>
diff --git a/textmodel/textmodel.h b/textmodel/textmodel.h
index e6faa6e..e63b7c3 100644
--- a/textmodel/textmodel.h
+++ b/textmodel/textmodel.h
@@ -1,9 +1,9 @@
 #ifndef _TEXTMODEL_H_
 #define _TEXTMODEL_H_
 
-#include <oberon.h>
-#include <typeregister.h>
-#include <store.h>
+#include "oberon.h"
+#include "typeregister/typeregister.h"
+#include "store/store.h"
 
 namespace odc {
 
diff --git a/typeregister/typeregister.cc b/typeregister/typeregister.cc
index b2ba566..91120c6 100644
--- a/typeregister/typeregister.cc
+++ b/typeregister/typeregister.cc
@@ -1,4 +1,4 @@
-#include <typeregister.h>
+#include "typeregister/typeregister.h"
 
 #include <iostream>
 
diff --git a/typeregister/typeregister.h b/typeregister/typeregister.h
index 52a5428..d6c83e3 100644
--- a/typeregister/typeregister.h
+++ b/typeregister/typeregister.h
@@ -1,10 +1,11 @@
 #ifndef _CLASSREGISTER_H_
 #define _CLASSREGISTER_H_
 
-#include <oberon.h>
 #include <map>
 #include <string>
 
+#include "oberon.h"
+
 namespace odc {
 	class Store;
 	class TypeProxyBase; // forward declaration
-- 
2.29.2