Merge pull request #13 from CMATHL/development

Development

.gitignore

@@ -51,7 +51,7 @@ Module.symvers
 Mkfile.old
 dkms.conf
 
-cml/include/config.h
+cml/include/cml/config.h
 build/*
 tmp/*
 install/*

cml/CMakeLists.txt

@@ -3,15 +3,15 @@ INCLUDE_DIRECTORIES(include)
 
 configure_file(
 	${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake
-	${CMAKE_CURRENT_SOURCE_DIR}/include/config.h
+	${CMAKE_CURRENT_SOURCE_DIR}/include/cml/config.h
 )
 
 SET(CML_MAIN_HEADERS
 		include/cml.h
-		include/config.h
 )
 
 SET(CML_CML_HEADERS
+	include/cml/config.h
 	include/cml/structures.h
 	include/cml/math.h
 	include/cml/easings.h
@@ -166,7 +166,7 @@ INSTALL(TARGETS ${CML_LIB_TARGET}
 		ARCHIVE DESTINATION lib${LIB_SUFFIX}
 		)
 INSTALL(FILES ${CML_MAIN_HEADERS} DESTINATION include)
-INSTALL(FILES ${CML_CML_HEADERS} DESTINATION include/cml/include)
+INSTALL(FILES ${CML_CML_HEADERS} DESTINATION include/cml)
 INSTALL(FILES ${CML_MATH_HEADERS} DESTINATION include/cml/math)
 INSTALL(FILES ${CML_MATH_TYPES_HEADERS} DESTINATION include/cml/math/types)
 INSTALL(FILES ${CML_MATH_FUNC_HEADERS} DESTINATION include/cml/math/functions)

cml/include/cml.h

@@ -31,7 +31,7 @@
         #define _CML_INLINE inline __attribute__((always_inline))
 #endif
 
-#include "config.h"
+#include "cml/config.h"
 
 /* Use `extern inline` for C99 or later */
 #ifdef PREDEF_STANDARD_C99
@@ -62,16 +62,16 @@
         __builtin_types_compatible_p(__typeof(__a), __typeof(__b))
 #endif
 
-#include "cml/include/math.h"
+#include "cml/math.h"
 
 /*
  #ifndef CML_NO_STRUCTURES
- #include "cml/include/structures.h"
+ #include "cml/structures.h"
  #endif
  */
 
 #ifndef CML_NO_EASING_FUNCTIONS
-        #include "cml/include/easings.h"
+        #include "cml/easings.h"
 #endif
 
 #endif

test/CMakeLists.txt

@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/cml/include)
 
 INCLUDE(../cmake/CMakeBuildFlags.cmake)