68 files changed, 54 insertions, 69 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4b2a52ca..976f19aec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -219,7 +219,6 @@ if(UNIT_TESTING)
     add_subdirectory(test)
 endif(UNIT_TESTING)
 
-add_subdirectory(csync)
 add_subdirectory(src)
 if(NOT BUILD_LIBRARIES_ONLY)
 add_subdirectory(shell_integration)
diff --git a/csync/CMakeLists.txt b/csync/CMakeLists.txt
deleted file mode 100644
index 8b36dde86..000000000
--- a/csync/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-# global needed variables
-set(APPLICATION_NAME "ocsync")
-
-set(LIBRARY_VERSION ${MIRALL_VERSION})
-set(LIBRARY_SOVERSION "0")
-
-# add definitions
-include(DefineCMakeDefaults)
-include(DefinePlatformDefaults)
-include(DefineCompilerFlags)
-include(DefineOptions.cmake)
-
-include(DefineInstallationPaths)
-
-# add macros
-include(MacroAddPlugin)
-include(MacroCopyFile)
-
-find_package(SQLite3 3.8.0 REQUIRED)
-
-include(ConfigureChecks.cmake)
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-if (MEM_NULL_TESTS)
-  add_definitions(-DCSYNC_MEM_NULL_TESTS)
-endif (MEM_NULL_TESTS)
-
-add_subdirectory(src)
-
-configure_file(config_csync.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_csync.h)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3cbacd537..f871836cf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,6 +8,7 @@ if(NOT TOKEN_AUTH_ONLY)
     find_package(Qt5Keychain REQUIRED)
 endif()
 
+add_subdirectory(csync)
 add_subdirectory(libsync)
 if (NOT BUILD_LIBRARIES_ONLY)
     add_subdirectory(gui)
diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt
index 4a0d76d71..26b641f21 100644
--- a/src/cmd/CMakeLists.txt
+++ b/src/cmd/CMakeLists.txt
@@ -12,9 +12,8 @@ include_directories(${CMAKE_SOURCE_DIR}/src/libsync
                    )
 
 # csync is required.
-include_directories(${CMAKE_SOURCE_DIR}/csync/src
-                    ${CMAKE_BINARY_DIR}/csync
-                    ${CMAKE_BINARY_DIR}/csync/src
+include_directories(${CMAKE_SOURCE_DIR}/src/csync
+                    ${CMAKE_BINARY_DIR}/src/csync
                    )
 
 # Need tokenizer for netrc parser
diff --git a/csync/AUTHORS b/src/csync/AUTHORS
index 5fd81c08e..5fd81c08e 100644
--- a/csync/AUTHORS
+++ b/src/csync/AUTHORS
diff --git a/csync/src/CMakeLists.txt b/src/csync/CMakeLists.txt
index 8bce5f418..db99a88d0 100644
--- a/csync/src/CMakeLists.txt
+++ b/src/csync/CMakeLists.txt
@@ -1,4 +1,31 @@
 project(libcsync)
+# global needed variables
+set(APPLICATION_NAME "ocsync")
+
+set(LIBRARY_VERSION ${MIRALL_VERSION})
+set(LIBRARY_SOVERSION "0")
+
+# add definitions
+include(DefineCMakeDefaults)
+include(DefinePlatformDefaults)
+include(DefineCompilerFlags)
+include(DefineOptions.cmake)
+
+include(DefineInstallationPaths)
+
+# add macros
+include(MacroAddPlugin)
+include(MacroCopyFile)
+
+find_package(SQLite3 3.8.0 REQUIRED)
+
+include(ConfigureChecks.cmake)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+if (MEM_NULL_TESTS)
+  add_definitions(-DCSYNC_MEM_NULL_TESTS)
+endif (MEM_NULL_TESTS)
 
 add_subdirectory(std)
 
@@ -136,4 +163,4 @@ else()
   )
 endif()
 
-
+configure_file(config_csync.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_csync.h)
diff --git a/csync/COPYING b/src/csync/COPYING
index 4362b4915..4362b4915 100644
--- a/csync/COPYING
+++ b/src/csync/COPYING
diff --git a/csync/ChangeLog b/src/csync/ChangeLog
index a95a07589..a95a07589 100644
--- a/csync/ChangeLog
+++ b/src/csync/ChangeLog
diff --git a/csync/ConfigureChecks.cmake b/src/csync/ConfigureChecks.cmake
index 6d64d5a63..6d64d5a63 100644
--- a/csync/ConfigureChecks.cmake
+++ b/src/csync/ConfigureChecks.cmake
diff --git a/csync/DefineOptions.cmake b/src/csync/DefineOptions.cmake
index 485e18322..485e18322 100644
--- a/csync/DefineOptions.cmake
+++ b/src/csync/DefineOptions.cmake
diff --git a/csync/INSTALL b/src/csync/INSTALL
index caf65c2bd..caf65c2bd 100644
--- a/csync/INSTALL
+++ b/src/csync/INSTALL
diff --git a/csync/README b/src/csync/README
index 2487e2415..2487e2415 100644
--- a/csync/README
+++ b/src/csync/README
diff --git a/csync/config_csync.h.cmake b/src/csync/config_csync.h.cmake
index f5c9f09b2..f5c9f09b2 100644
--- a/csync/config_csync.h.cmake
+++ b/src/csync/config_csync.h.cmake
diff --git a/csync/src/csync.c b/src/csync/csync.c
index 1f75ac3bd..1f75ac3bd 100644
--- a/csync/src/csync.c
+++ b/src/csync/csync.c
diff --git a/csync/src/csync.h b/src/csync/csync.h
index daf778c24..daf778c24 100644
--- a/csync/src/csync.h
+++ b/src/csync/csync.h
diff --git a/csync/src/csync_exclude.c b/src/csync/csync_exclude.c
index fea662504..fea662504 100644
--- a/csync/src/csync_exclude.c
+++ b/src/csync/csync_exclude.c
diff --git a/csync/src/csync_exclude.h b/src/csync/csync_exclude.h
index 722d27cac..722d27cac 100644
--- a/csync/src/csync_exclude.h
+++ b/src/csync/csync_exclude.h
diff --git a/csync/src/csync_log.c b/src/csync/csync_log.c
index 4a2e24a32..4a2e24a32 100644
--- a/csync/src/csync_log.c
+++ b/src/csync/csync_log.c
diff --git a/csync/src/csync_log.h b/src/csync/csync_log.h
index 0cd0d01fc..0cd0d01fc 100644
--- a/csync/src/csync_log.h
+++ b/src/csync/csync_log.h
diff --git a/csync/src/csync_macros.h b/src/csync/csync_macros.h
index f128b434d..f128b434d 100644
--- a/csync/src/csync_macros.h
+++ b/src/csync/csync_macros.h
diff --git a/csync/src/csync_misc.c b/src/csync/csync_misc.c
index d23236113..d23236113 100644
--- a/csync/src/csync_misc.c
+++ b/src/csync/csync_misc.c
diff --git a/csync/src/csync_misc.h b/src/csync/csync_misc.h
index 6b9f98418..6b9f98418 100644
--- a/csync/src/csync_misc.h
+++ b/src/csync/csync_misc.h
diff --git a/csync/src/csync_private.h b/src/csync/csync_private.h
index 2edc26019..2edc26019 100644
--- a/csync/src/csync_private.h
+++ b/src/csync/csync_private.h
diff --git a/csync/src/csync_reconcile.c b/src/csync/csync_reconcile.c
index 59156e800..59156e800 100644
--- a/csync/src/csync_reconcile.c
+++ b/src/csync/csync_reconcile.c
diff --git a/csync/src/csync_reconcile.h b/src/csync/csync_reconcile.h
index f333adba6..f333adba6 100644
--- a/csync/src/csync_reconcile.h
+++ b/src/csync/csync_reconcile.h
diff --git a/csync/src/csync_rename.cc b/src/csync/csync_rename.cc
index 5cc43ce22..5cc43ce22 100644
--- a/csync/src/csync_rename.cc
+++ b/src/csync/csync_rename.cc
diff --git a/csync/src/csync_rename.h b/src/csync/csync_rename.h
index 53968324c..53968324c 100644
--- a/csync/src/csync_rename.h
+++ b/src/csync/csync_rename.h
diff --git a/csync/src/csync_statedb.c b/src/csync/csync_statedb.c
index 056ca48dd..056ca48dd 100644
--- a/csync/src/csync_statedb.c
+++ b/src/csync/csync_statedb.c
diff --git a/csync/src/csync_statedb.h b/src/csync/csync_statedb.h
index 601e34a1b..601e34a1b 100644
--- a/csync/src/csync_statedb.h
+++ b/src/csync/csync_statedb.h
diff --git a/csync/src/csync_time.c b/src/csync/csync_time.c
index 85bdd5ff4..85bdd5ff4 100644
--- a/csync/src/csync_time.c
+++ b/src/csync/csync_time.c
diff --git a/csync/src/csync_time.h b/src/csync/csync_time.h
index 1492bef8d..1492bef8d 100644
--- a/csync/src/csync_time.h
+++ b/src/csync/csync_time.h
diff --git a/csync/src/csync_update.c b/src/csync/csync_update.c
index 1a069442e..1a069442e 100644
--- a/csync/src/csync_update.c
+++ b/src/csync/csync_update.c
diff --git a/csync/src/csync_update.h b/src/csync/csync_update.h
index 4a7495e3a..4a7495e3a 100644
--- a/csync/src/csync_update.h
+++ b/src/csync/csync_update.h
diff --git a/csync/src/csync_util.c b/src/csync/csync_util.c
index 1bc09c35c..1bc09c35c 100644
--- a/csync/src/csync_util.c
+++ b/src/csync/csync_util.c
diff --git a/csync/src/csync_util.h b/src/csync/csync_util.h
index f65ada592..f65ada592 100644
--- a/csync/src/csync_util.h
+++ b/src/csync/csync_util.h
diff --git a/csync/src/csync_version.h.in b/src/csync/csync_version.h.in
index 9471734b8..9471734b8 100644
--- a/csync/src/csync_version.h.in
+++ b/src/csync/csync_version.h.in
diff --git a/csync/src/std/CMakeLists.txt b/src/csync/std/CMakeLists.txt
index 519cada86..519cada86 100644
--- a/csync/src/std/CMakeLists.txt
+++ b/src/csync/std/CMakeLists.txt
diff --git a/csync/src/std/asprintf.c b/src/csync/std/asprintf.c
index 8738df973..8738df973 100644
--- a/csync/src/std/asprintf.c
+++ b/src/csync/std/asprintf.c
diff --git a/csync/src/std/asprintf.h b/src/csync/std/asprintf.h
index d6dd2e859..d6dd2e859 100644
--- a/csync/src/std/asprintf.h
+++ b/src/csync/std/asprintf.h
diff --git a/csync/src/std/c_alloc.c b/src/csync/std/c_alloc.c
index b87a3836f..b87a3836f 100644
--- a/csync/src/std/c_alloc.c
+++ b/src/csync/std/c_alloc.c
diff --git a/csync/src/std/c_alloc.h b/src/csync/std/c_alloc.h
index 6eeccd69d..6eeccd69d 100644
--- a/csync/src/std/c_alloc.h
+++ b/src/csync/std/c_alloc.h
diff --git a/csync/src/std/c_jhash.h b/src/csync/std/c_jhash.h
index 261a0a4a4..261a0a4a4 100644
--- a/csync/src/std/c_jhash.h
+++ b/src/csync/std/c_jhash.h
diff --git a/csync/src/std/c_lib.h b/src/csync/std/c_lib.h
index b9c1ea8d3..b9c1ea8d3 100644
--- a/csync/src/std/c_lib.h
+++ b/src/csync/std/c_lib.h
diff --git a/csync/src/std/c_macro.h b/src/csync/std/c_macro.h
index a4a0e1c1c..a4a0e1c1c 100644
--- a/csync/src/std/c_macro.h
+++ b/src/csync/std/c_macro.h
diff --git a/csync/src/std/c_path.c b/src/csync/std/c_path.c
index 1094a1c67..1094a1c67 100644
--- a/csync/src/std/c_path.c
+++ b/src/csync/std/c_path.c
diff --git a/csync/src/std/c_path.h b/src/csync/std/c_path.h
index 291b1b8d3..291b1b8d3 100644
--- a/csync/src/std/c_path.h
+++ b/src/csync/std/c_path.h
diff --git a/csync/src/std/c_private.h b/src/csync/std/c_private.h
index 26bba70db..26bba70db 100644
--- a/csync/src/std/c_private.h
+++ b/src/csync/std/c_private.h
diff --git a/csync/src/std/c_rbtree.c b/src/csync/std/c_rbtree.c
index 9a38fd0a6..9a38fd0a6 100644
--- a/csync/src/std/c_rbtree.c
+++ b/src/csync/std/c_rbtree.c
diff --git a/csync/src/std/c_rbtree.h b/src/csync/std/c_rbtree.h
index 635458fd2..635458fd2 100644
--- a/csync/src/std/c_rbtree.h
+++ b/src/csync/std/c_rbtree.h
diff --git a/csync/src/std/c_string.c b/src/csync/std/c_string.c
index 8929f2458..8929f2458 100644
--- a/csync/src/std/c_string.c
+++ b/src/csync/std/c_string.c
diff --git a/csync/src/std/c_string.h b/src/csync/std/c_string.h
index 304c598a2..304c598a2 100644
--- a/csync/src/std/c_string.h
+++ b/src/csync/std/c_string.h
diff --git a/csync/src/std/c_time.c b/src/csync/std/c_time.c
index ad43fed02..ad43fed02 100644
--- a/csync/src/std/c_time.c
+++ b/src/csync/std/c_time.c
diff --git a/csync/src/std/c_time.h b/src/csync/std/c_time.h
index aa8ef2f16..aa8ef2f16 100644
--- a/csync/src/std/c_time.h
+++ b/src/csync/std/c_time.h
diff --git a/csync/src/std/c_utf8.cc b/src/csync/std/c_utf8.cc
index 4bd5d75ac..4bd5d75ac 100644
--- a/csync/src/std/c_utf8.cc
+++ b/src/csync/std/c_utf8.cc
diff --git a/csync/src/vio/csync_vio.c b/src/csync/vio/csync_vio.c
index 909117836..909117836 100644
--- a/csync/src/vio/csync_vio.c
+++ b/src/csync/vio/csync_vio.c
diff --git a/csync/src/vio/csync_vio.h b/src/csync/vio/csync_vio.h
index 715b18542..715b18542 100644
--- a/csync/src/vio/csync_vio.h
+++ b/src/csync/vio/csync_vio.h
diff --git a/csync/src/vio/csync_vio_file_stat.c b/src/csync/vio/csync_vio_file_stat.c
index 8ebb64f33..8ebb64f33 100644
--- a/csync/src/vio/csync_vio_file_stat.c
+++ b/src/csync/vio/csync_vio_file_stat.c
diff --git a/csync/src/vio/csync_vio_local.h b/src/csync/vio/csync_vio_local.h
index 294383121..294383121 100644
--- a/csync/src/vio/csync_vio_local.h
+++ b/src/csync/vio/csync_vio_local.h
diff --git a/csync/src/vio/csync_vio_local_unix.c b/src/csync/vio/csync_vio_local_unix.c
index 5d5666688..5d5666688 100644
--- a/csync/src/vio/csync_vio_local_unix.c
+++ b/src/csync/vio/csync_vio_local_unix.c
diff --git a/csync/src/vio/csync_vio_local_win.c b/src/csync/vio/csync_vio_local_win.c
index fc4eea512..fc4eea512 100644
--- a/csync/src/vio/csync_vio_local_win.c
+++ b/src/csync/vio/csync_vio_local_win.c
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 2157d3cd6..f7cc0a9db 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -181,11 +181,9 @@ set(3rdparty_INC
 include_directories(${3rdparty_INC})
 
 # csync is required.
-include_directories(${CMAKE_SOURCE_DIR}/csync/src
-                    ${CMAKE_BINARY_DIR}/csync
-                    ${CMAKE_BINARY_DIR}/csync/src
+include_directories(${CMAKE_SOURCE_DIR}/src/csync
+                    ${CMAKE_BINARY_DIR}/src/csync
                    )
-
 include_directories(../libsync ${CMAKE_CURRENT_BINARY_DIR}/../libsync)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
index 65d68823d..865dad895 100644
--- a/src/libsync/CMakeLists.txt
+++ b/src/libsync/CMakeLists.txt
@@ -5,9 +5,8 @@ configure_file( version.h.in "${CMAKE_CURRENT_BINARY_DIR}/version.h" )
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 # csync is required.
-include_directories(${CMAKE_SOURCE_DIR}/csync/src
-                    ${CMAKE_BINARY_DIR}/csync
-                    ${CMAKE_BINARY_DIR}/csync/src
+include_directories(${CMAKE_SOURCE_DIR}/src/csync
+                    ${CMAKE_BINARY_DIR}/src/csync
                    )
 
 if ( APPLE )
diff --git a/src/libsync/syncjournaldb.cpp b/src/libsync/syncjournaldb.cpp
index 0eb34e609..203c14988 100644
--- a/src/libsync/syncjournaldb.cpp
+++ b/src/libsync/syncjournaldb.cpp
@@ -31,7 +31,7 @@
 #include "asserts.h"
 #include "checksums.h"
 
-#include "../../csync/src/std/c_jhash.h"
+#include "std/c_jhash.h"
 
 namespace OCC {
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ebf349207..d6b68cb5c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,7 +1,17 @@
-include_directories(${CMAKE_BINARY_DIR}/csync ${CMAKE_BINARY_DIR}/csync/src ${CMAKE_BINARY_DIR}/src)
-include_directories(${CMAKE_SOURCE_DIR}/csync/src/)
-include_directories(${CMAKE_SOURCE_DIR}/csync/src/std ${CMAKE_SOURCE_DIR}/src)
-include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/qtokenizer)
+include_directories(${QT_INCLUDES}
+                    ${CMAKE_SOURCE_DIR}/src
+                    ${CMAKE_SOURCE_DIR}/src/3rdparty/qtokenizer
+                    ${CMAKE_SOURCE_DIR}/src/csync
+                    ${CMAKE_SOURCE_DIR}/src/csync/std
+                    ${CMAKE_SOURCE_DIR}/src/gui
+                    ${CMAKE_SOURCE_DIR}/src/libsync
+                    ${CMAKE_BINARY_DIR}/src/csync
+                    ${CMAKE_BINARY_DIR}/src/libsync
+                    ${CMAKE_CURRENT_SOURCE_DIR}
+                    ${CMAKE_CURRENT_BINARY_DIR}
+                   )
+
+include_directories()
 
 include(QtVersionAbstraction)
 setup_qt()
diff --git a/test/csync/csync_tests/check_csync_exclude.c b/test/csync/csync_tests/check_csync_exclude.c
index ea9ca0e2f..1d145b240 100644
--- a/test/csync/csync_tests/check_csync_exclude.c
+++ b/test/csync/csync_tests/check_csync_exclude.c
@@ -27,7 +27,7 @@
 #define CSYNC_TEST 1
 #include "csync_exclude.c"
 
-#define EXCLUDE_LIST_FILE SOURCEDIR"/../sync-exclude.lst"
+#define EXCLUDE_LIST_FILE SOURCEDIR"/../../sync-exclude.lst"
 
 static int setup(void **state) {
     CSYNC *csync;
diff --git a/test/owncloud_add_test.cmake b/test/owncloud_add_test.cmake
index cefe264ea..7e7cc5057 100644
--- a/test/owncloud_add_test.cmake
+++ b/test/owncloud_add_test.cmake
@@ -1,11 +1,4 @@
 macro(owncloud_add_test test_class additional_cpp)
-    include_directories(${QT_INCLUDES}
-                        "${PROJECT_SOURCE_DIR}/src/gui"
-                        "${PROJECT_SOURCE_DIR}/src/libsync"
-                        "${CMAKE_BINARY_DIR}/src/libsync"
-                        "${CMAKE_CURRENT_BINARY_DIR}"
-                       )
-
     set(CMAKE_AUTOMOC TRUE)
     set(OWNCLOUD_TEST_CLASS ${test_class})
     string(TOLOWER "${OWNCLOUD_TEST_CLASS}" OWNCLOUD_TEST_CLASS_LOWERCASE)
@@ -27,14 +20,6 @@ macro(owncloud_add_test test_class additional_cpp)
 endmacro()
 
 macro(owncloud_add_benchmark test_class additional_cpp)
-    include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                        ${QT_INCLUDES}
-                        "${PROJECT_SOURCE_DIR}/src/gui"
-                        "${PROJECT_SOURCE_DIR}/src/libsync"
-                        "${CMAKE_BINARY_DIR}/src/libsync"
-                        "${CMAKE_CURRENT_BINARY_DIR}"
-                       )
-
     set(CMAKE_AUTOMOC TRUE)
     set(OWNCLOUD_TEST_CLASS ${test_class})
     string(TOLOWER "${OWNCLOUD_TEST_CLASS}" OWNCLOUD_TEST_CLASS_LOWERCASE)
diff --git a/test/testexcludedfiles.cpp b/test/testexcludedfiles.cpp
index b52bfb5a9..cfaf73499 100644
--- a/test/testexcludedfiles.cpp
+++ b/test/testexcludedfiles.cpp
@@ -11,7 +11,7 @@
 
 using namespace OCC;
 
-#define EXCLUDE_LIST_FILE SOURCEDIR"/../sync-exclude.lst"
+#define EXCLUDE_LIST_FILE SOURCEDIR"/../../sync-exclude.lst"
 
 class TestExcludedFiles: public QObject
 {
diff --git a/test/testsyncjournaldb.cpp b/test/testsyncjournaldb.cpp
index 881bb865d..9e412aa85 100644
--- a/test/testsyncjournaldb.cpp
+++ b/test/testsyncjournaldb.cpp
@@ -8,8 +8,8 @@
 
 #include <sqlite3.h>
 
-#include "libsync/syncjournaldb.h"
-#include "libsync/syncjournalfilerecord.h"
+#include "syncjournaldb.h"
+#include "syncjournalfilerecord.h"
 
 using namespace OCC;