Get rid of per-module -I

diff --git a/Makefile b/Makefile
index 94be64aa62d6a2830bc12d153a9f158d43aeafb6..90f9d3d94966421d0f16474a58357adfad2c0f6c 100644 (file)
--- 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 dc4f50920c7d61d30bec5744a7bba9e8ccacd018..38c70bd2ee966b7ae76507be34d2ae8ab0be9fe7 100644 (file)
--- 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 77db1febc2239e3d12886ff7ee8e44e2a8edc90f..5cc1262856a6a541a942f33c61e9762289c9e4df 100644 (file)
--- 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 b88d24b66a303e2b0602e755cfd01c6cbcdff707..7fdf01b6d66d0bfe53a833325576abd0aada23d2 100644 (file)
--- 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 e8c78b7e57e72e5300cb122781a3eb130bda215b..3725b47093cbd96287c162b49471f24b3ffde6ac 100644 (file)
--- 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 d2aa025e12713d516fa5355d7d4751a03c5a1a50..a509ab6bc7a72468e72243815aaf794a47057240 100644 (file)
--- 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 ffca53deacab5f2a2cfa280b6107ee0e5b23371a..9f3402ce370f8ee5afba72bbf618bbe7784be963 100644 (file)
--- 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 e59f36c2417bf4bdaffad708f99984fcb0250799..b7becc0cef671b24d3d4cd968f628d8323dc2396 100644 (file)
--- 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 4f4b6c013fec64a39cc3e87668aa070c39afa691..31befb7d1905e98f126ce3d7bbc2b1e54118d38d 100644 (file)
--- 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 6f44e8525457c8135b7eafc9c773753fc93a545f..c85d831b7e058f2d525860c9105e3e61aca415e5 100644 (file)
--- 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 03d1c8f226021011461eaa4daeb3d669e3c1e572..5743cb09f938ff770840fa32ed610e70d16eb9fe 100644 (file)
--- 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 7afc34c7983ccaf56ee3cb37ca05a92a1cb0de4a..720654a1492e4def31ba5da0b330a8e689ed7ca3 100644 (file)
--- 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 e6faa6ec8ee2a25d792f6fd451ca2f29d61fd43e..e63b7c35799f3c20cd46c21f7ef3d876a8dddcc8 100644 (file)
--- 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 b2ba56669f504fe48c893c133af8cd67287341c0..91120c6b6c504f116207aebab59cce3a4d5d543a 100644 (file)
--- 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 52a542821a93877baf7cae8f9a4dbcaa7d4d58d1..d6c83e39c2a74df6a1acab4bd42bd0e426a1575a 100644 (file)
--- 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