From 28736c578701393f35cac2bd2ad49de18d7f879e Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 28 Jun 2017 18:23:49 -0400
Subject: [PATCH] Move example -> examples

And the compositor example into its own directory
---
 CMakeLists.txt                                     | 2 +-
 {example => examples}/CMakeLists.txt               | 3 +--
 {example => examples}/cat.c                        | 0
 {example => examples}/cat.h                        | 0
 example/compositor.c => examples/compositor/main.c | 2 --
 {example => examples}/pointer.c                    | 0
 {example => examples}/rotation.c                   | 0
 {example => examples}/shared.c                     | 0
 {example => examples}/shared.h                     | 0
 {example => examples}/simple.c                     | 0
 {example => examples}/tablet.c                     | 0
 {example => examples}/touch.c                      | 0
 12 files changed, 2 insertions(+), 5 deletions(-)
 rename {example => examples}/CMakeLists.txt (97%)
 rename {example => examples}/cat.c (100%)
 rename {example => examples}/cat.h (100%)
 rename example/compositor.c => examples/compositor/main.c (92%)
 rename {example => examples}/pointer.c (100%)
 rename {example => examples}/rotation.c (100%)
 rename {example => examples}/shared.c (100%)
 rename {example => examples}/shared.h (100%)
 rename {example => examples}/simple.c (100%)
 rename {example => examples}/tablet.c (100%)
 rename {example => examples}/touch.c (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae2397b2..b15882ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,4 +63,4 @@ add_subdirectory(session)
 add_subdirectory(render)
 add_subdirectory(util)
 
-add_subdirectory(example)
+add_subdirectory(examples)
diff --git a/example/CMakeLists.txt b/examples/CMakeLists.txt
similarity index 97%
rename from example/CMakeLists.txt
rename to examples/CMakeLists.txt
index 100e110a..956ea886 100644
--- a/example/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -67,7 +67,7 @@ target_link_libraries(tablet
 )
 
 add_executable(compositor
-    compositor
+    compositor/main.c
     shared.c
 )
 
@@ -75,6 +75,5 @@ target_link_libraries(compositor
     wlr-backend
     wlr-session
     wlr-render
-    wlr-wayland
     ${XKBCOMMON_LIBRARIES}
 )
diff --git a/example/cat.c b/examples/cat.c
similarity index 100%
rename from example/cat.c
rename to examples/cat.c
diff --git a/example/cat.h b/examples/cat.h
similarity index 100%
rename from example/cat.h
rename to examples/cat.h
diff --git a/example/compositor.c b/examples/compositor/main.c
similarity index 92%
rename from example/compositor.c
rename to examples/compositor/main.c
index a52fe460..3e83978e 100644
--- a/example/compositor.c
+++ b/examples/compositor/main.c
@@ -10,7 +10,6 @@
 #include <wlr/render.h>
 #include <wlr/render/gles2.h>
 #include <wlr/types/wlr_output.h>
-#include <wlr/wayland/wlr_compositor.h>
 #include <xkbcommon/xkbcommon.h>
 #include "shared.h"
 
@@ -38,7 +37,6 @@ int main() {
 
 	state.renderer = wlr_gles2_renderer_init();
 	wl_display_init_shm(compositor.display);
-	wlr_compositor_init(compositor.display);
 
 	compositor_run(&compositor);
 }
diff --git a/example/pointer.c b/examples/pointer.c
similarity index 100%
rename from example/pointer.c
rename to examples/pointer.c
diff --git a/example/rotation.c b/examples/rotation.c
similarity index 100%
rename from example/rotation.c
rename to examples/rotation.c
diff --git a/example/shared.c b/examples/shared.c
similarity index 100%
rename from example/shared.c
rename to examples/shared.c
diff --git a/example/shared.h b/examples/shared.h
similarity index 100%
rename from example/shared.h
rename to examples/shared.h
diff --git a/example/simple.c b/examples/simple.c
similarity index 100%
rename from example/simple.c
rename to examples/simple.c
diff --git a/example/tablet.c b/examples/tablet.c
similarity index 100%
rename from example/tablet.c
rename to examples/tablet.c
diff --git a/example/touch.c b/examples/touch.c
similarity index 100%
rename from example/touch.c
rename to examples/touch.c