From f9fe4f579caf129df7bf52798d0477af33470d93 Mon Sep 17 00:00:00 2001
From: Sebastian Messmer <heinzisoft@web.de>
Date: Tue, 4 Nov 2014 22:33:43 +0100
Subject: [PATCH] Reorder folder structure

---
 src/{cryfs_lib => }/CryFuse.cpp     | 0
 src/{cryfs_lib => }/CryFuse.h       | 4 ++--
 src/cryfs_lib/CMakeLists.txt        | 6 ++----
 src/cryfs_lib/fusepp/CMakeLists.txt | 3 ---
 src/fusepp/CMakeLists.txt           | 3 +++
 src/{cryfs_lib => }/fusepp/Fuse.cpp | 0
 src/{cryfs_lib => }/fusepp/Fuse.h   | 0
 src/{cryfs_lib => }/fusepp/params.h | 0
 src/main.cpp                        | 2 +-
 9 files changed, 8 insertions(+), 10 deletions(-)
 rename src/{cryfs_lib => }/CryFuse.cpp (100%)
 rename src/{cryfs_lib => }/CryFuse.h (97%)
 delete mode 100644 src/cryfs_lib/fusepp/CMakeLists.txt
 create mode 100644 src/fusepp/CMakeLists.txt
 rename src/{cryfs_lib => }/fusepp/Fuse.cpp (100%)
 rename src/{cryfs_lib => }/fusepp/Fuse.h (100%)
 rename src/{cryfs_lib => }/fusepp/params.h (100%)

diff --git a/src/cryfs_lib/CryFuse.cpp b/src/CryFuse.cpp
similarity index 100%
rename from src/cryfs_lib/CryFuse.cpp
rename to src/CryFuse.cpp
diff --git a/src/cryfs_lib/CryFuse.h b/src/CryFuse.h
similarity index 97%
rename from src/cryfs_lib/CryFuse.h
rename to src/CryFuse.h
index f40037cb..a92d2c05 100644
--- a/src/cryfs_lib/CryFuse.h
+++ b/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 {
 
diff --git a/src/cryfs_lib/CMakeLists.txt b/src/cryfs_lib/CMakeLists.txt
index caf93364..95b0c809 100644
--- a/src/cryfs_lib/CMakeLists.txt
+++ b/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)
diff --git a/src/cryfs_lib/fusepp/CMakeLists.txt b/src/cryfs_lib/fusepp/CMakeLists.txt
deleted file mode 100644
index f46d3f2b..00000000
--- a/src/cryfs_lib/fusepp/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_library(fusepp Fuse.cpp)
-
-target_link_libraries(fusepp fuse)
diff --git a/src/fusepp/CMakeLists.txt b/src/fusepp/CMakeLists.txt
new file mode 100644
index 00000000..6586c8f9
--- /dev/null
+++ b/src/fusepp/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(fusepp Fuse.cpp)
+
+target_link_libraries(fusepp fuse boost_filesystem boost_system)
diff --git a/src/cryfs_lib/fusepp/Fuse.cpp b/src/fusepp/Fuse.cpp
similarity index 100%
rename from src/cryfs_lib/fusepp/Fuse.cpp
rename to src/fusepp/Fuse.cpp
diff --git a/src/cryfs_lib/fusepp/Fuse.h b/src/fusepp/Fuse.h
similarity index 100%
rename from src/cryfs_lib/fusepp/Fuse.h
rename to src/fusepp/Fuse.h
diff --git a/src/cryfs_lib/fusepp/params.h b/src/fusepp/params.h
similarity index 100%
rename from src/cryfs_lib/fusepp/params.h
rename to src/fusepp/params.h
diff --git a/src/main.cpp b/src/main.cpp
index b6463e43..2bb7c793 100644
--- a/src/main.cpp
+++ b/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[])
 {