reorganize the directory structure a bit

18 files changed, 11 insertions, 20 deletions

diff --git a/include/OpenCL/device.h b/include/OpenCL/device.h
deleted file mode 100644
index b34a525..0000000
--- a/include/OpenCL/device.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef DEVICE_H
-#define DEVICE_H
-
-#include "OpenCL/cl.h"
-
-struct _cl_device_id {
-    struct pipe_screen *screen;
-};
-
-#endif
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d41c7ec..b8ff200 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 include_directories (${Clover_SOURCE_DIR}/include
-                    ${Clover_SOURCE_DIR}
+                    ${Clover_SOURCE_DIR}/src
                     ${LLVM_INCLUDE_DIR}
                     ${GALLIUM_INCLUDE_DIRS}
                     ${CLANG_INCLUDE_DIRS}
@@ -8,15 +8,16 @@ include_directories (${Clover_SOURCE_DIR}/include
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 
 set(CLOVER_SRC_FILES
-    core/api_command.cpp  core/api_device.cpp
-    core/api_event.cpp  core/api_kernel.cpp
-    core/api_platform.cpp   core/api_program.cpp
-    core/device.cpp core/api_context.cpp
-    core/api_enqueue.cpp  core/api_flush.cpp
-    core/api_memory.cpp  core/api_profiling.cpp
-    core/api_sampler.cpp core/api_gl.cpp
+    api/api_command.cpp  api/api_device.cpp
+    api/api_event.cpp  api/api_kernel.cpp
+    api/api_platform.cpp   api/api_program.cpp
+    api/api_context.cpp
+    api/api_enqueue.cpp  api/api_flush.cpp
+    api/api_memory.cpp  api/api_profiling.cpp
+    api/api_sampler.cpp api/api_gl.cpp
+    core/device.cpp
     compiler/compiler.cpp
-    ../cpuwinsys/cpuwinsys.c)
+    cpuwinsys/cpuwinsys.c)
 
 add_library(OpenCL SHARED ${CLOVER_SRC_FILES})
 
diff --git a/src/core/api_command.cpp b/src/api/api_command.cpp
index 4f1c417..4f1c417 100644
--- a/src/core/api_command.cpp
+++ b/src/api/api_command.cpp
diff --git a/src/core/api_context.cpp b/src/api/api_context.cpp
index fbf3af9..fbf3af9 100644
--- a/src/core/api_context.cpp
+++ b/src/api/api_context.cpp
diff --git a/src/core/api_device.cpp b/src/api/api_device.cpp
index cfb61ad..f91ad29 100644
--- a/src/core/api_device.cpp
+++ b/src/api/api_device.cpp
@@ -1,7 +1,7 @@
 #include "OpenCL/cl.h"
 #include "OpenCL/cl_platform.h"
 
-#include "device.h"
+#include "core/device.h"
 
 #include "pipe/p_screen.h"
 #include "pipe/p_format.h"
diff --git a/src/core/api_enqueue.cpp b/src/api/api_enqueue.cpp
index 15091b4..15091b4 100644
--- a/src/core/api_enqueue.cpp
+++ b/src/api/api_enqueue.cpp
diff --git a/src/core/api_event.cpp b/src/api/api_event.cpp
index 9c08011..9c08011 100644
--- a/src/core/api_event.cpp
+++ b/src/api/api_event.cpp
diff --git a/src/core/api_flush.cpp b/src/api/api_flush.cpp
index 34afab0..34afab0 100644
--- a/src/core/api_flush.cpp
+++ b/src/api/api_flush.cpp
diff --git a/src/core/api_gl.cpp b/src/api/api_gl.cpp
index 757df6a..757df6a 100644
--- a/src/core/api_gl.cpp
+++ b/src/api/api_gl.cpp
diff --git a/src/core/api_kernel.cpp b/src/api/api_kernel.cpp
index 27d7c81..27d7c81 100644
--- a/src/core/api_kernel.cpp
+++ b/src/api/api_kernel.cpp
diff --git a/src/core/api_memory.cpp b/src/api/api_memory.cpp
index 19d4095..19d4095 100644
--- a/src/core/api_memory.cpp
+++ b/src/api/api_memory.cpp
diff --git a/src/core/api_platform.cpp b/src/api/api_platform.cpp
index b6429e7..b6429e7 100644
--- a/src/core/api_platform.cpp
+++ b/src/api/api_platform.cpp
diff --git a/src/core/api_profiling.cpp b/src/api/api_profiling.cpp
index 5980dee..5980dee 100644
--- a/src/core/api_profiling.cpp
+++ b/src/api/api_profiling.cpp
diff --git a/src/core/api_program.cpp b/src/api/api_program.cpp
index 98999fa..98999fa 100644
--- a/src/core/api_program.cpp
+++ b/src/api/api_program.cpp
diff --git a/src/core/api_sampler.cpp b/src/api/api_sampler.cpp
index 8c4d74a..8c4d74a 100644
--- a/src/core/api_sampler.cpp
+++ b/src/api/api_sampler.cpp
diff --git a/cpuwinsys/.gitignore b/src/cpuwinsys/.gitignore
index c2b82d6..c2b82d6 100644
--- a/cpuwinsys/.gitignore
+++ b/src/cpuwinsys/.gitignore
diff --git a/cpuwinsys/cpuwinsys.c b/src/cpuwinsys/cpuwinsys.c
index 00d5efb..00d5efb 100644
--- a/cpuwinsys/cpuwinsys.c
+++ b/src/cpuwinsys/cpuwinsys.c
diff --git a/cpuwinsys/cpuwinsys.h b/src/cpuwinsys/cpuwinsys.h
index 5894933..5894933 100644
--- a/cpuwinsys/cpuwinsys.h
+++ b/src/cpuwinsys/cpuwinsys.h