From 7801d1af764476ec0cf9e9a0c9bafde5cd788205 Mon Sep 17 00:00:00 2001
From: Levi Neely <141506390+lneely@users.noreply.github.com>
Date: Thu, 27 Jun 2024 22:32:13 +0200
Subject: [PATCH] more reorganization

---
 .gitignore                                          |  2 +-
 CMakeLists.txt                                      |  5 +++--
 Makefile                                            | 12 ++++++------
 control_tools.cpp => cmd/pcloudcc/control_tools.cpp |  0
 control_tools.h => cmd/pcloudcc/control_tools.h     |  0
 main.cpp => cmd/pcloudcc/main.cpp                   |  0
 pclsync_lib.cpp => cmd/pcloudcc/pclsync_lib.cpp     |  0
 pclsync_lib.h => cmd/pcloudcc/pclsync_lib.h         |  0
 pclsync_lib_c.cpp => cmd/pcloudcc/pclsync_lib_c.cpp |  0
 pclsync_lib_c.h => cmd/pcloudcc/pclsync_lib_c.h     |  0
 pdevice_monitor.c => cmd/pcloudcc/pdevice_monitor.c |  0
 pdevice_monitor.h => cmd/pcloudcc/pdevice_monitor.h |  0
 12 files changed, 10 insertions(+), 9 deletions(-)
 rename control_tools.cpp => cmd/pcloudcc/control_tools.cpp (100%)
 rename control_tools.h => cmd/pcloudcc/control_tools.h (100%)
 rename main.cpp => cmd/pcloudcc/main.cpp (100%)
 rename pclsync_lib.cpp => cmd/pcloudcc/pclsync_lib.cpp (100%)
 rename pclsync_lib.h => cmd/pcloudcc/pclsync_lib.h (100%)
 rename pclsync_lib_c.cpp => cmd/pcloudcc/pclsync_lib_c.cpp (100%)
 rename pclsync_lib_c.h => cmd/pcloudcc/pclsync_lib_c.h (100%)
 rename pdevice_monitor.c => cmd/pcloudcc/pdevice_monitor.c (100%)
 rename pdevice_monitor.h => cmd/pcloudcc/pdevice_monitor.h (100%)

diff --git a/.gitignore b/.gitignore
index 74468e7..079cb84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@
 **/*.so
 /install_manifest.txt
 a.out
-**/*/pcloudcc
+cmd/pcloudcc/build/pcloudcc
 **/*/.cache/
 **/*/compile_commands.json
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77784b5..b1cac7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,7 @@ set (CMAKE_C_FLAGS "-fPIC")
 set (PCLSYNC_PATH ${CMAKE_SOURCE_DIR}/lib/pclsync)
 set (MBEDTLS_PATH ${CMAKE_SOURCE_DIR}/lib/mbedtls)
 set (SQLITE3_PATH ${CMAKE_SOURCE_DIR}/lib/sqlite)
+set (CMD_PATH ${CMAKE_SOURCE_DIR}/cmd/pcloudcc)
 
 #add_subdirectory(${MBEDTLS_PATH})
 
@@ -52,12 +53,12 @@ include_directories(${OVERLAY_CLENT_PATH})
 add_library(sqlite3 STATIC ${SQLITE3_PATH}/sqlite3.c)
 target_link_libraries(sqlite3 z dl)
 
-add_library(pcloudcc_lib SHARED pclsync_lib_c.cpp pclsync_lib.cpp control_tools.cpp ${OVERLAY_CLENT_PATH}/overlay_client.c ${OVERLAY_CLENT_PATH}/debug.c )
+add_library(pcloudcc_lib SHARED ${CMD_PATH}/pclsync_lib_c.cpp ${CMD_PATH}/pclsync_lib.cpp ${CMD_PATH}/control_tools.cpp ${OVERLAY_CLENT_PATH}/overlay_client.c ${OVERLAY_CLENT_PATH}/debug.c )
 
 target_link_libraries(pcloudcc_lib ${PCLSYNC_PATH}/psynclib.a  ${MBEDTLS_PATH}/build/library/libmbedtls.a fuse pthread sqlite3 udev
 )
 
-add_executable(pcloudcc main.cpp)
+add_executable(pcloudcc ${CMD_PATH}/main.cpp)
 
 target_link_libraries(pcloudcc pcloudcc_lib)
 
diff --git a/Makefile b/Makefile
index af73472..7c77ff5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
 all:
-	make -C lib/pclsync fs
+	make -C ./lib/pclsync fs
 	cmake -H./lib/mbedtls -B./lib/mbedtls/build
-	make -C lib/mbedtls/build
-	mkdir -p build
-	cmake -H. -B./build
-	make -C build
+	make -C ./lib/mbedtls/build
+	mkdir -p ./cmd/pcloudcc/build
+	cmake -H. -B./cmd/pcloudcc/build
+	make -C ./cmd/pcloudcc/build
 
 clean:
 	make -C lib/pclsync clean
 	rm -rf lib/mbedtls/build
-	rm -rf ./build
+	rm -rf ./cmd/pcloudcc/build
 
 
diff --git a/control_tools.cpp b/cmd/pcloudcc/control_tools.cpp
similarity index 100%
rename from control_tools.cpp
rename to cmd/pcloudcc/control_tools.cpp
diff --git a/control_tools.h b/cmd/pcloudcc/control_tools.h
similarity index 100%
rename from control_tools.h
rename to cmd/pcloudcc/control_tools.h
diff --git a/main.cpp b/cmd/pcloudcc/main.cpp
similarity index 100%
rename from main.cpp
rename to cmd/pcloudcc/main.cpp
diff --git a/pclsync_lib.cpp b/cmd/pcloudcc/pclsync_lib.cpp
similarity index 100%
rename from pclsync_lib.cpp
rename to cmd/pcloudcc/pclsync_lib.cpp
diff --git a/pclsync_lib.h b/cmd/pcloudcc/pclsync_lib.h
similarity index 100%
rename from pclsync_lib.h
rename to cmd/pcloudcc/pclsync_lib.h
diff --git a/pclsync_lib_c.cpp b/cmd/pcloudcc/pclsync_lib_c.cpp
similarity index 100%
rename from pclsync_lib_c.cpp
rename to cmd/pcloudcc/pclsync_lib_c.cpp
diff --git a/pclsync_lib_c.h b/cmd/pcloudcc/pclsync_lib_c.h
similarity index 100%
rename from pclsync_lib_c.h
rename to cmd/pcloudcc/pclsync_lib_c.h
diff --git a/pdevice_monitor.c b/cmd/pcloudcc/pdevice_monitor.c
similarity index 100%
rename from pdevice_monitor.c
rename to cmd/pcloudcc/pdevice_monitor.c
diff --git a/pdevice_monitor.h b/cmd/pcloudcc/pdevice_monitor.h
similarity index 100%
rename from pdevice_monitor.h
rename to cmd/pcloudcc/pdevice_monitor.h