compile.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c0fb17..efa4601 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,6 +69,9 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 
 # osl
+#find_package(GMP REQUIRED)
+#add_subdirectory(osl)
+
 	find_package(osl REQUIRED)
 
 # Flex
@@ -120,7 +123,7 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 		${BISON_clan_parser_OUTPUTS}
 		${FLEX_clan_scanner_OUTPUTS}
 	)
-	target_link_libraries(clan ${OSL_LIBRARY})
+	target_link_libraries(clan osl)
 	get_property(clan_lib_location TARGET clan PROPERTY LOCATION)
 	message(STATUS "Add clan library (shared) ${clan_lib_location}")
 
@@ -133,7 +136,7 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 		${FLEX_clan_scanner_OUTPUTS}
 	)
 	set_target_properties(clan_static PROPERTIES OUTPUT_NAME clan)
-	target_link_libraries(clan_static ${OSL_LIBRARY})
+	target_link_libraries(clan_static osl)
 	get_property(clan_static_lib_location TARGET clan_static PROPERTY LOCATION)
 	message(STATUS "Add clan library (static) ${clan_static_lib_location}")
 
@@ -145,7 +148,7 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 	message(STATUS "Add executable clan")
 	add_executable(clan_exe "source/clan.c")
 	set_target_properties(clan_exe PROPERTIES OUTPUT_NAME "clan")
-	target_link_libraries(clan_exe clan_static ${OSL_LIBRARY})
+	target_link_libraries(clan_exe clan_static osl)
 
 	# clan test
 	find_package(PythonInterp)
diff --git a/osl b/osl
index 1fa5e35..403e15a 160000
--- a/osl
+++ b/osl
@@ -1 +1 @@
-Subproject commit 1fa5e35415ed51ee93127bc1ebdd4b9ab7f86da3
+Subproject commit 403e15a962e98330bc263a379d5629cae3393a68-dirty
diff --git a/source/scanner.l b/source/scanner.l
index eae7f0f..55a252a 100644
--- a/source/scanner.l
+++ b/source/scanner.l
@@ -53,7 +53,7 @@ IS ((u|U)|(u|U)?(l|L|ll|LL)|(l|L|ll|LL)(u|U))
    #include <osl/relation_list.h>
    #include <osl/statement.h>
    #include <osl/scop.h>
-   #include <source/parser.h>
+   #include <clan/parser.h>
    #include <clan/macros.h>
    #include <clan/symbol.h>
    #include <clan/options.h>
diff --git a/source/scop.c b/source/scop.c
index ece9a31..7a4b9a1 100644
--- a/source/scop.c
+++ b/source/scop.c
@@ -54,7 +54,7 @@
 #include <osl/generic.h>
 #include <osl/body.h>
 #include <osl/scop.h>
-#include <source/parser.h>
+#include <clan/parser.h>
 #include <clan/macros.h>
 #include <clan/options.h>
 #include <clan/relation.h>