Merge pull request #196 from HappySeaFox/feature/reorganize-includes

Feature/reorganize includes

CMakeLists.txt

@@ -210,14 +210,14 @@ include_directories("${PROJECT_BINARY_DIR}/include")
 
 # Configure subdirs
 #
-add_subdirectory(src/libsail-common)
-add_subdirectory(src/libsail-manip)
+add_subdirectory(src/sail-common)
 add_subdirectory(src/sail-codecs)
 if (SAIL_COMBINE_CODECS)
     add_subdirectory(src/sail-codecs-archive)
 endif()
-add_subdirectory(src/libsail)
-add_subdirectory(src/bindings/c++)
+add_subdirectory(src/sail)
+add_subdirectory(src/sail-manip)
+add_subdirectory(src/bindings/sail-c++)
 
 if (SAIL_BUILD_APPS)
     add_subdirectory(examples/c/sail)

cmake/sail_check_c11_thread_local.cmake

@@ -6,7 +6,7 @@ function(sail_check_c11_thread_local)
 
         check_c_source_compiles(
             "
-            #include \"libsail-common/compiler_specifics.h\"
+            #include \"sail-common/compiler_specifics.h\"
 
             int main(int argc, char *argv[]) {
                 static SAIL_THREAD_LOCAL int i = 0;

debian/libsail-c++-dev.install

@@ -1,4 +1,4 @@
 usr/include/sail/sail-c++
 usr/lib/*/libsail-c++.so
-usr/lib/*/pkgconfig/libsail-c++.pc
+usr/lib/*/pkgconfig/sail-c++.pc
 usr/lib/cmake/sailc++/SailC++*.cmake

debian/libsail-common-dev.install

@@ -1,4 +1,4 @@
 usr/include/sail/sail-common/
 usr/lib/*/libsail-common.so
-usr/lib/*/pkgconfig/libsail-common.pc
+usr/lib/*/pkgconfig/sail-common.pc
 usr/lib/cmake/sailcommon/SailCommon*.cmake

debian/libsail-dev.install

@@ -1,5 +1,5 @@
 usr/include/sail/sail
 usr/lib/*/libsail.so
-usr/lib/*/pkgconfig/libsail.pc
+usr/lib/*/pkgconfig/sail.pc
 usr/lib/cmake/sail/SailConfig*.cmake
 usr/lib/cmake/sail/SailTargets*.cmake

debian/libsail-manip-dev.install

@@ -1,4 +1,4 @@
 usr/include/sail/sail-manip/
 usr/lib/*/libsail-manip.so
-usr/lib/*/pkgconfig/libsail-manip.pc
+usr/lib/*/pkgconfig/sail-manip.pc
 usr/lib/cmake/sailmanip/SailManip*.cmake

examples/c/sail-sdl-viewer/sail-sdl-viewer.c

@@ -23,17 +23,15 @@
     SOFTWARE.
 */
 
-#include "config.h"
-
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <SDL2/SDL.h>
 
-#include "sail-common.h"
-#include "sail.h"
-#include "sail-manip.h"
+#include <sail/sail.h>
+
+#include <sail-manip/sail-manip.h>
 
 int main(int argc, char *argv[]) {
 

examples/c/sail/sail.c

@@ -23,14 +23,13 @@
     SOFTWARE.
 */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h> /* atoi */
 #include <string.h>
 
-#include "sail.h"
-#include "sail-manip.h"
+#include <sail/sail.h>
+
+#include <sail-manip/sail-manip.h>
 
 static void print_invalid_argument(void) {
     fprintf(stderr, "Error: Invalid arguments. Run with -h to see command arguments.\n");