Reorder folder structure

src/CryFuse.h

@@ -3,8 +3,8 @@
 #define CRYFS_LIB_CRYFUSE_H_
 
 #include "fusepp/Fuse.h"
-#include "CryDevice.h"
-#include "utils/macros.h"
+#include "cryfs_lib/CryDevice.h"
+#include "cryfs_lib/utils/macros.h"
 
 namespace cryfs {
 

src/cryfs_lib/CMakeLists.txt

@@ -1,5 +1,3 @@
-add_subdirectory(fusepp)
+add_library(cryfs_lib CryDevice.cpp)
 
-add_library(cryfs_lib CryDevice.cpp CryFuse.cpp)
-
-target_link_libraries(cryfs_lib fusepp boost_filesystem boost_system)
+target_link_libraries(cryfs_lib)

src/cryfs_lib/fusepp/CMakeLists.txt

@@ -1,3 +0,0 @@
-add_library(fusepp Fuse.cpp)
-
-target_link_libraries(fusepp fuse)

src/fusepp/CMakeLists.txt

@@ -0,0 +1,3 @@
+add_library(fusepp Fuse.cpp)
+
+target_link_libraries(fusepp fuse boost_filesystem boost_system)

src/main.cpp

@@ -3,7 +3,7 @@
 #include <cstdlib>
 #include "buildconfig/BuildConfig.h"
 
-#include "cryfs_lib/CryFuse.h"
+#include "CryFuse.h"
 
 int main (int argc, char *argv[])
 {