From 4fe78b8e10778430c911f11036f096e0a90874f4 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <jacob.benoit.1@gmail.com>
Date: Sun, 7 Oct 2007 15:59:09 +0000
Subject: [PATCH] reorganization of headers, part 2/2...

---
 doc/example.cpp         |  2 +-
 doc/tutorial.cpp        |  2 +-
 src/CMakeLists.txt      |  8 ++------
 src/Core.h              | 12 ++++++++++++
 src/Core/CMakeLists.txt |  6 +++---
 src/Core/Object.h       |  3 ---
 test/CMakeLists.txt     |  3 ---
 test/main.h             |  4 ++--
 8 files changed, 21 insertions(+), 19 deletions(-)
 create mode 100644 src/Core.h

diff --git a/doc/example.cpp b/doc/example.cpp
index 25321f4f8..75d47f988 100644
--- a/doc/example.cpp
+++ b/doc/example.cpp
@@ -1,4 +1,4 @@
-#include "../src/All"
+#include "../src/Core.h"
 
 using namespace std;
 
diff --git a/doc/tutorial.cpp b/doc/tutorial.cpp
index 794df8fd3..7c45bbde9 100644
--- a/doc/tutorial.cpp
+++ b/doc/tutorial.cpp
@@ -1,4 +1,4 @@
-#include "../src/All"
+#include "../src/Core.h"
 
 using namespace std;
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d5cdda888..12c48c4a4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,4 @@
-set(Eigen_SRCS
-  All
-  Core
-  Manip
-)
+FILE(GLOB Eigen_SRCS "*.h")
 
 SET(INCLUDE_INSTALL_DIR
     "${CMAKE_INSTALL_PREFIX}/include/eigen2"
@@ -15,4 +11,4 @@ INSTALL(FILES
   DESTINATION ${INCLUDE_INSTALL_DIR}
   )
 
-add_subdirectory(internal)
\ No newline at end of file
+add_subdirectory(Core)
\ No newline at end of file
diff --git a/src/Core.h b/src/Core.h
new file mode 100644
index 000000000..e22fb0996
--- /dev/null
+++ b/src/Core.h
@@ -0,0 +1,12 @@
+#include "Core/Util.h"
+#include "Core/Numeric.h"
+#include "Core/Object.h"
+#include "Core/MatrixRef.h"
+#include "Core/MatrixStorage.h"
+#include "Core/Matrix.h"
+#include "Core/Row.h"
+#include "Core/Column.h"
+#include "Core/Block.h"
+#include "Core/Minor.h"
+#include "Core/Transpose.h"
+#include "Core/Conjugate.h"
diff --git a/src/Core/CMakeLists.txt b/src/Core/CMakeLists.txt
index c3643b916..dc4473416 100644
--- a/src/Core/CMakeLists.txt
+++ b/src/Core/CMakeLists.txt
@@ -1,6 +1,6 @@
-FILE(GLOB Eigen_internal_SRCS "*.h")
+FILE(GLOB Eigen_Core_SRCS "*.h")
 
 INSTALL(FILES 
-  ${Eigen_internal_SRCS}
-  DESTINATION ${INCLUDE_INSTALL_DIR}/internal
+  ${Eigen_Core_SRCS}
+  DESTINATION ${INCLUDE_INSTALL_DIR}/Core
   )
diff --git a/src/Core/Object.h b/src/Core/Object.h
index e969e9ee0..387350da8 100644
--- a/src/Core/Object.h
+++ b/src/Core/Object.h
@@ -26,9 +26,6 @@
 #ifndef EI_OBJECT_H
 #define EI_OBJECT_H
 
-#include "Util.h"
-#include "Loop.h"
-
 template<typename Scalar, typename Derived> class EiObject
 {
     static const int RowsAtCompileTime = Derived::RowsAtCompileTime,
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 36a46c9a2..352daa291 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -11,9 +11,6 @@ SET(test_SRCS
   matrixmanip.cpp
 )
 QT4_AUTOMOC(${test_SRCS})
-INCLUDE_DIRECTORIES(
-  ${CMAKE_SOURCE_DIR}/src
-)
 
 ADD_EXECUTABLE(test ${test_SRCS})
 TARGET_LINK_LIBRARIES(test ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
diff --git a/test/main.h b/test/main.h
index 1a6644530..91d63c7f8 100644
--- a/test/main.h
+++ b/test/main.h
@@ -27,8 +27,8 @@
 #define EI_TEST_MAIN_H
 
 #include <QtTest/QtTest>
-#include <All>
-#include <complex>
+#include "../src/Core.h"
+
 #include <cstdlib>
 #include <ctime>