kms++: organize into subdirs

56 files changed, 41 insertions, 40 deletions

diff --git a/kms++/CMakeLists.txt b/kms++/CMakeLists.txt
index 4409b8b..d983964 100644
--- a/kms++/CMakeLists.txt
+++ b/kms++/CMakeLists.txt
@@ -1,8 +1,12 @@
 include_directories(${LIBDRM_INCLUDE_DIRS})
 link_directories(${LIBDRM_LIBRARY_DIRS})
 
-file(GLOB SRCS "*.cpp" "*.h")
+file(GLOB SRCS "src/*.cpp" "src/*.h" "inc/kms++/*.h")
 add_library(kms++ ${SRCS})
 
+target_include_directories(kms++ PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
+    $<INSTALL_INTERFACE:include>
+    PRIVATE src)
+
 target_link_libraries(kms++ ${LIBDRM_LIBRARIES})
-target_include_directories(kms++ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/kms++/atomicreq.h b/kms++/inc/kms++/atomicreq.h
index 6ebdbf8..6ebdbf8 100644
--- a/kms++/atomicreq.h
+++ b/kms++/inc/kms++/atomicreq.h
diff --git a/kms++/blob.h b/kms++/inc/kms++/blob.h
index fd872f1..fd872f1 100644
--- a/kms++/blob.h
+++ b/kms++/inc/kms++/blob.h
diff --git a/kms++/card.h b/kms++/inc/kms++/card.h
index 5ecaecf..5ecaecf 100644
--- a/kms++/card.h
+++ b/kms++/inc/kms++/card.h
diff --git a/kms++/connector.h b/kms++/inc/kms++/connector.h
index 6ccc959..6ccc959 100644
--- a/kms++/connector.h
+++ b/kms++/inc/kms++/connector.h
diff --git a/kms++/crtc.h b/kms++/inc/kms++/crtc.h
index f3b525a..f3b525a 100644
--- a/kms++/crtc.h
+++ b/kms++/inc/kms++/crtc.h
diff --git a/kms++/decls.h b/kms++/inc/kms++/decls.h
index e84b29a..e84b29a 100644
--- a/kms++/decls.h
+++ b/kms++/inc/kms++/decls.h
diff --git a/kms++/drmobject.h b/kms++/inc/kms++/drmobject.h
index a939aa7..a939aa7 100644
--- a/kms++/drmobject.h
+++ b/kms++/inc/kms++/drmobject.h
diff --git a/kms++/drmpropobject.h b/kms++/inc/kms++/drmpropobject.h
index ec28d45..ec28d45 100644
--- a/kms++/drmpropobject.h
+++ b/kms++/inc/kms++/drmpropobject.h
diff --git a/kms++/dumbframebuffer.h b/kms++/inc/kms++/dumbframebuffer.h
index 6b3ee64..6b3ee64 100644
--- a/kms++/dumbframebuffer.h
+++ b/kms++/inc/kms++/dumbframebuffer.h
diff --git a/kms++/encoder.h b/kms++/inc/kms++/encoder.h
index b5aac70..b5aac70 100644
--- a/kms++/encoder.h
+++ b/kms++/inc/kms++/encoder.h
diff --git a/kms++/extframebuffer.h b/kms++/inc/kms++/extframebuffer.h
index eab7e3c..eab7e3c 100644
--- a/kms++/extframebuffer.h
+++ b/kms++/inc/kms++/extframebuffer.h
diff --git a/kms++/framebuffer.h b/kms++/inc/kms++/framebuffer.h
index cbf705d..cbf705d 100644
--- a/kms++/framebuffer.h
+++ b/kms++/inc/kms++/framebuffer.h
diff --git a/kms++/kms++.h b/kms++/inc/kms++/kms++.h
index 3365ef7..3365ef7 100644
--- a/kms++/kms++.h
+++ b/kms++/inc/kms++/kms++.h
diff --git a/kms++/modedb.h b/kms++/inc/kms++/modedb.h
index 43c7afc..43c7afc 100644
--- a/kms++/modedb.h
+++ b/kms++/inc/kms++/modedb.h
diff --git a/kms++/pagefliphandler.h b/kms++/inc/kms++/pagefliphandler.h
index 79cda0d..79cda0d 100644
--- a/kms++/pagefliphandler.h
+++ b/kms++/inc/kms++/pagefliphandler.h
diff --git a/kms++/pipeline.h b/kms++/inc/kms++/pipeline.h
index ef04ec1..ef04ec1 100644
--- a/kms++/pipeline.h
+++ b/kms++/inc/kms++/pipeline.h
diff --git a/kms++/pixelformats.h b/kms++/inc/kms++/pixelformats.h
index 813eaef..813eaef 100644
--- a/kms++/pixelformats.h
+++ b/kms++/inc/kms++/pixelformats.h
diff --git a/kms++/plane.h b/kms++/inc/kms++/plane.h
index d50e539..d50e539 100644
--- a/kms++/plane.h
+++ b/kms++/inc/kms++/plane.h
diff --git a/kms++/property.h b/kms++/inc/kms++/property.h
index b9097ff..b9097ff 100644
--- a/kms++/property.h
+++ b/kms++/inc/kms++/property.h
diff --git a/kms++/videomode.h b/kms++/inc/kms++/videomode.h
index f9abaf9..f9abaf9 100644
--- a/kms++/videomode.h
+++ b/kms++/inc/kms++/videomode.h
diff --git a/kms++/atomicreq.cpp b/kms++/src/atomicreq.cpp
index 3aa2ff6..01934ae 100644
--- a/kms++/atomicreq.cpp
+++ b/kms++/src/atomicreq.cpp
@@ -4,9 +4,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
-#include "atomicreq.h"
-#include "property.h"
-#include "card.h"
+#include <kms++/kms++.h>
 
 #ifndef DRM_CLIENT_CAP_ATOMIC
 
diff --git a/kms++/blob.cpp b/kms++/src/blob.cpp
index 10a71c6..e1cd1f8 100644
--- a/kms++/blob.cpp
+++ b/kms++/src/blob.cpp
@@ -1,7 +1,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
-#include "kms++.h"
+#include <kms++/kms++.h>
 
 using namespace std;
 
diff --git a/kms++/card.cpp b/kms++/src/card.cpp
index 918c825..0a34d14 100644
--- a/kms++/card.cpp
+++ b/kms++/src/card.cpp
@@ -9,7 +9,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
-#include "kms++.h"
+#include <kms++/kms++.h>
 
 using namespace std;
 
diff --git a/kms++/connector.cpp b/kms++/src/connector.cpp
index 0f471e1..ec37d5d 100644
--- a/kms++/connector.cpp
+++ b/kms++/src/connector.cpp
@@ -4,7 +4,7 @@
 #include <fcntl.h>
 #include <cassert>
 
-#include "kms++.h"
+#include <kms++/kms++.h>
 #include "helpers.h"
 
 using namespace std;
diff --git a/kms++/crtc.cpp b/kms++/src/crtc.cpp
index 6cbdf0c..bad7d31 100644
--- a/kms++/crtc.cpp
+++ b/kms++/src/crtc.cpp
@@ -4,7 +4,7 @@
 #include <fcntl.h>
 #include <cassert>
 
-#include "kms++.h"
+#include <kms++/kms++.h>
 #include "helpers.h"
 
 using namespace std;
diff --git a/kms++/drmobject.cpp b/kms++/src/drmobject.cpp
index 8abecc7..f94fc5d 100644
--- a/kms++/drmobject.cpp
+++ b/kms++/src/drmobject.cpp
@@ -5,7 +5,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
-#include "kms++.h"
+#include <kms++/kms++.h>
 
 using namespace std;
 
diff --git a/kms++/drmpropobject.cpp b/kms++/src/drmpropobject.cpp
index 50f87a7..f2edf8b 100644
--- a/kms++/drmpropobject.cpp
+++ b/kms++/src/drmpropobject.cpp
@@ -5,7 +5,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
-#include "kms++.h"
+#include <kms++/kms++.h>
 
 using namespace std;
 
diff --git a/kms++/dumbframebuffer.cpp b/kms++/src/dumbframebuffer.cpp
index fcd01d0..d2f5db2 100644
--- a/kms++/dumbframebuffer.cpp
+++ b/kms++/src/dumbframebuffer.cpp
@@ -10,7 +10,7 @@
 #include <drm.h>
 #include <drm_mode.h>
 
-#include "kms++.h"
+#include <kms++/kms++.h>
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
diff --git a/kms++/encoder.cpp b/kms++/src/encoder.cpp
index 1ed2d5c..2168f2f 100644
--- a/kms++/encoder.cpp
+++ b/kms++/src/encoder.cpp
@@ -6,7 +6,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
-#include "kms++.h"
+#include <kms++/kms++.h>
 
 using namespace std;
 
diff --git a/kms++/extframebuffer.cpp b/kms++/src/extframebuffer.cpp
index 352c1a7..0ade454 100644
--- a/kms++/extframebuffer.cpp
+++ b/kms++/src/extframebuffer.cpp
@@ -5,7 +5,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
-#include "kms++.h"
+#include <kms++/kms++.h>
 
 using namespace std;
 
diff --git a/kms++/framebuffer.cpp b/kms++/src/framebuffer.cpp
index bf9ab01..a7f589c 100644
--- a/kms++/framebuffer.cpp
+++ b/kms++/src/framebuffer.cpp
@@ -5,7 +5,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
-#include "kms++.h"
+#include <kms++/kms++.h>
 
 using namespace std;
 
diff --git a/kms++/helpers.cpp b/kms++/src/helpers.cpp
index 715e757..8bd082b 100644
--- a/kms++/helpers.cpp
+++ b/kms++/src/helpers.cpp
@@ -1,5 +1,5 @@
 
-#include "connector.h"
+#include <kms++/kms++.h>
 #include "helpers.h"
 #include <cstring>
 
diff --git a/kms++/helpers.h b/kms++/src/helpers.h
index 4eb597c..4eb597c 100644
--- a/kms++/helpers.h
+++ b/kms++/src/helpers.h
diff --git a/kms++/modedb.cpp b/kms++/src/modedb.cpp
index 53dcfcf..24d6f63 100644
--- a/kms++/modedb.cpp
+++ b/kms++/src/modedb.cpp
@@ -1,8 +1,7 @@
 #include <xf86drm.h>
 #include <stdexcept>
 
-#include "modedb.h"
-#include "videomode.h"
+#include <kms++/modedb.h>
 
 using namespace std;
 
diff --git a/kms++/modedb_cea.cpp b/kms++/src/modedb_cea.cpp
index a1f4ab9..a105dd8 100644
--- a/kms++/modedb_cea.cpp
+++ b/kms++/src/modedb_cea.cpp
@@ -29,7 +29,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "modedb.h"
+#include <kms++/modedb.h>
 
 #include <xf86drm.h>
 
diff --git a/kms++/modedb_dmt.cpp b/kms++/src/modedb_dmt.cpp
index 6c74c5e..e3f2ad5 100644
--- a/kms++/modedb_dmt.cpp
+++ b/kms++/src/modedb_dmt.cpp
@@ -29,7 +29,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "modedb.h"
+#include <kms++/modedb.h>
 
 #include <xf86drm.h>
 
diff --git a/kms++/pixelformats.cpp b/kms++/src/pixelformats.cpp
index 594bd6d..f2b1137 100644
--- a/kms++/pixelformats.cpp
+++ b/kms++/src/pixelformats.cpp
@@ -1,6 +1,6 @@
 #include <map>
 
-#include "pixelformats.h"
+#include <kms++/pixelformats.h>
 
 using namespace std;
 
diff --git a/kms++/plane.cpp b/kms++/src/plane.cpp
index 46cd3e6..10aaeda 100644
--- a/kms++/plane.cpp
+++ b/kms++/src/plane.cpp
@@ -6,7 +6,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
-#include "kms++.h"
+#include <kms++/kms++.h>
 
 using namespace std;
 
diff --git a/kms++/property.cpp b/kms++/src/property.cpp
index e4390ba..ee79922 100644
--- a/kms++/property.cpp
+++ b/kms++/src/property.cpp
@@ -1,7 +1,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
-#include "kms++.h"
+#include <kms++/kms++.h>
 
 using namespace std;
 
diff --git a/kms++/videomode.cpp b/kms++/src/videomode.cpp
index 5c98c00..30d47f8 100644
--- a/kms++/videomode.cpp
+++ b/kms++/src/videomode.cpp
@@ -1,7 +1,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
-#include "videomode.h"
+#include <kms++/kms++.h>
 #include "helpers.h"
 
 using namespace std;
diff --git a/kms++util/colorbar.cpp b/kms++util/colorbar.cpp
index 6a5dbc4..9e6e68d 100644
--- a/kms++util/colorbar.cpp
+++ b/kms++util/colorbar.cpp
@@ -1,6 +1,6 @@
 #include <cstdint>
 
-#include <kms++.h>
+#include <kms++/kms++.h>
 #include "kms++util.h"
 
 namespace kms
diff --git a/kms++util/cpuframebuffer.h b/kms++util/cpuframebuffer.h
index d2073bc..1498528 100644
--- a/kms++util/cpuframebuffer.h
+++ b/kms++util/cpuframebuffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "kms++.h"
+#include <kms++/kms++.h>
 
 namespace kms
 {
diff --git a/kms++util/drawing.cpp b/kms++util/drawing.cpp
index 9018817..2ca567c 100644
--- a/kms++util/drawing.cpp
+++ b/kms++util/drawing.cpp
@@ -1,5 +1,5 @@
 
-#include <kms++.h>
+#include <kms++/kms++.h>
 #include <kms++util.h>
 
 using namespace std;
diff --git a/kms++util/extcpuframebuffer.h b/kms++util/extcpuframebuffer.h
index 172841f..5d3be74 100644
--- a/kms++util/extcpuframebuffer.h
+++ b/kms++util/extcpuframebuffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "kms++.h"
+#include <kms++/kms++.h>
 
 namespace kms
 {
diff --git a/kms++util/kms++util.h b/kms++util/kms++util.h
index 6c835c8..0c07d18 100644
--- a/kms++util/kms++util.h
+++ b/kms++util/kms++util.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <kms++.h>
+#include <kms++/kms++.h>
 
 #include "color.h"
 #include <cstdio>
diff --git a/kms++util/testpat.cpp b/kms++util/testpat.cpp
index b859180..7a2e4d3 100644
--- a/kms++util/testpat.cpp
+++ b/kms++util/testpat.cpp
@@ -5,7 +5,7 @@
 #include <cassert>
 #include <thread>
 
-#include <kms++.h>
+#include <kms++/kms++.h>
 #include <kms++util.h>
 #include <cpuframebuffer.h>
 #include "stopwatch.h"
diff --git a/kmscube/cube-gbm.cpp b/kmscube/cube-gbm.cpp
index f6d312b..93ebece 100644
--- a/kmscube/cube-gbm.cpp
+++ b/kmscube/cube-gbm.cpp
@@ -9,7 +9,7 @@
 #include <xf86drmMode.h>
 #include <gbm.h>
 
-#include <kms++.h>
+#include <kms++/kms++.h>
 #include <kms++util.h>
 #include "cube-egl.h"
 #include "cube-gles2.h"
diff --git a/py/pykms.cpp b/py/pykms.cpp
index deb8276..57ca363 100644
--- a/py/pykms.cpp
+++ b/py/pykms.cpp
@@ -1,6 +1,6 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
-#include <kms++.h>
+#include <kms++/kms++.h>
 
 namespace py = pybind11;
 
diff --git a/py/pykmsbase.cpp b/py/pykmsbase.cpp
index efc760a..3d1998e 100644
--- a/py/pykmsbase.cpp
+++ b/py/pykmsbase.cpp
@@ -1,6 +1,6 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
-#include <kms++.h>
+#include <kms++/kms++.h>
 
 namespace py = pybind11;
 
diff --git a/py/pykmsutil.cpp b/py/pykmsutil.cpp
index 0d4cf89..f060bdf 100644
--- a/py/pykmsutil.cpp
+++ b/py/pykmsutil.cpp
@@ -1,6 +1,6 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
-#include <kms++.h>
+#include <kms++/kms++.h>
 #include <kms++util.h>
 
 namespace py = pybind11;
diff --git a/utils/kmsblank.cpp b/utils/kmsblank.cpp
index 8b883bb..864f269 100644
--- a/utils/kmsblank.cpp
+++ b/utils/kmsblank.cpp
@@ -2,7 +2,7 @@
 #include <unistd.h>
 #include <algorithm>
 
-#include <kms++.h>
+#include <kms++/kms++.h>
 #include <kms++util.h>
 #include "opts.h"
 
diff --git a/utils/kmscapture.cpp b/utils/kmscapture.cpp
index 7fc054e..dc65f1e 100644
--- a/utils/kmscapture.cpp
+++ b/utils/kmscapture.cpp
@@ -9,7 +9,7 @@
 #include <xf86drm.h>
 #include <glob.h>
 
-#include <kms++.h>
+#include <kms++/kms++.h>
 #include <kms++util.h>
 #include <opts.h>
 
diff --git a/utils/kmsprint.cpp b/utils/kmsprint.cpp
index 3b17f5b..7c8e01f 100644
--- a/utils/kmsprint.cpp
+++ b/utils/kmsprint.cpp
@@ -5,7 +5,7 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#include "kms++.h"
+#include <kms++/kms++.h>
 #include "opts.h"
 #include "kms++util.h"
 #include "strhelpers.h"
diff --git a/utils/kmsview.cpp b/utils/kmsview.cpp
index b59e004..8efcecd 100644
--- a/utils/kmsview.cpp
+++ b/utils/kmsview.cpp
@@ -2,7 +2,7 @@
 #include <fstream>
 #include <unistd.h>
 
-#include <kms++.h>
+#include <kms++/kms++.h>
 #include <kms++util.h>
 #include <opts.h>
 
diff --git a/utils/testpat.cpp b/utils/testpat.cpp
index 094e22a..4fe8d0b 100644
--- a/utils/testpat.cpp
+++ b/utils/testpat.cpp
@@ -5,8 +5,8 @@
 #include <set>
 #include <chrono>
 
-#include <kms++.h>
-#include <modedb.h>
+#include <kms++/kms++.h>
+#include <kms++/modedb.h>
 
 #include <kms++util.h>
 #include <opts.h>