From 35b8d329a9e286f83d202909554141eb2dc16071 Mon Sep 17 00:00:00 2001
From: Bastian Dehn <hhaalo@arcor.de>
Date: Fri, 13 Aug 2021 23:50:50 +0200
Subject: [PATCH] change: compile with shared lib subdir

---
 CMakeLists.txt                                | 26 ++++---------------
 libs/spandisc/CMakeLists.txt                  | 14 ++++++++++
 .../spandisc/include}/filehandler.h           |  0
 .../spandisc/include}/libspandisc.h           |  0
 .../spandisc/include}/logic.h                 |  0
 .../spandisc/include}/spandisc.h              |  0
 .../spandisc/include}/splitter.h              |  0
 .../spandisc/src}/filehandler.c               |  0
 {libspandisc => libs/spandisc/src}/logic.c    |  0
 {libspandisc => libs/spandisc/src}/splitter.c |  0
 {discspan => src}/discspan.c                  |  0
 {discspan => src}/help.c                      |  0
 {discspan => src}/help.h                      |  0
 13 files changed, 19 insertions(+), 21 deletions(-)
 create mode 100644 libs/spandisc/CMakeLists.txt
 rename {libspandisc => libs/spandisc/include}/filehandler.h (100%)
 rename {libspandisc => libs/spandisc/include}/libspandisc.h (100%)
 rename {libspandisc => libs/spandisc/include}/logic.h (100%)
 rename {libspandisc => libs/spandisc/include}/spandisc.h (100%)
 rename {libspandisc => libs/spandisc/include}/splitter.h (100%)
 rename {libspandisc => libs/spandisc/src}/filehandler.c (100%)
 rename {libspandisc => libs/spandisc/src}/logic.c (100%)
 rename {libspandisc => libs/spandisc/src}/splitter.c (100%)
 rename {discspan => src}/discspan.c (100%)
 rename {discspan => src}/help.c (100%)
 rename {discspan => src}/help.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b813633..f88f793 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,32 +4,16 @@ set(CMAKE_C_COMPILER gcc)
 set(CMAKE_C_FLAGS "-Wall")
 
 set(BINPATH "/usr/local/bin")
-set(LIBPATH "/usr/local/lib")
-set(HEADERPATH "/usr/local/include")
 
 project(discspan)
 
-include_directories(libspandisc)
-if (SHAREDLIB)
-	file(GLOB SOURCES discspan/*.c)
+file(GLOB SOURCES src/*.c)
+set(SOURCES ${SOURCES})
 
-	file(GLOB SOURCE_LIB libspandisc/*.c)
-	file(GLOB PUBLIC_HEADER libspandisc/*.h)
-	add_library(spandisc SHARED ${SOURCE_LIB})
-	set_target_properties(spandisc PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADER}")
-	install(TARGETS spandisc DESTINATION ${BINPATH}
-		LIBRARY DESTINATION ${LIBPATH}
-		PUBLIC_HEADER DESTINATION ${HEADERPATH})
-else()
-	file(GLOB SOURCES discspan/*.c libspandisc/*.c)
-endif()
+include_directories(libs/spandisc/include)
+add_subdirectory(libs/spandisc)
 
 add_executable(discspan ${SOURCES})
-
-if (SHAREDLIB)
-	target_link_libraries(discspan m "-L." spandisc)
-else()
-	target_link_libraries(discspan m)
-endif()
+target_link_libraries(discspan m "-L." spandisc)
 
 install(TARGETS discspan DESTINATION ${BINPATH})
diff --git a/libs/spandisc/CMakeLists.txt b/libs/spandisc/CMakeLists.txt
new file mode 100644
index 0000000..fec7038
--- /dev/null
+++ b/libs/spandisc/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.13.4)
+
+set(INSTALL_LIBPATH /usr/local/lib)
+set(INSTALL_HEADER /usr/local/include/spandisc)
+
+project(spandisc)
+
+file(GLOB SOURCES src/*.c)
+file(GLOB PUBLIC_HEADER include/*.h)
+include_directories(include)
+add_library(spandisc SHARED ${SOURCES})
+set_target_properties(spandisc PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADER}")
+install(TARGETS spandisc DESTINATION ${INSTALL_LIBPATH}
+	PUBLIC_HEADER DESTINATION ${INSTALL_HEADER})
diff --git a/libspandisc/filehandler.h b/libs/spandisc/include/filehandler.h
similarity index 100%
rename from libspandisc/filehandler.h
rename to libs/spandisc/include/filehandler.h
diff --git a/libspandisc/libspandisc.h b/libs/spandisc/include/libspandisc.h
similarity index 100%
rename from libspandisc/libspandisc.h
rename to libs/spandisc/include/libspandisc.h
diff --git a/libspandisc/logic.h b/libs/spandisc/include/logic.h
similarity index 100%
rename from libspandisc/logic.h
rename to libs/spandisc/include/logic.h
diff --git a/libspandisc/spandisc.h b/libs/spandisc/include/spandisc.h
similarity index 100%
rename from libspandisc/spandisc.h
rename to libs/spandisc/include/spandisc.h
diff --git a/libspandisc/splitter.h b/libs/spandisc/include/splitter.h
similarity index 100%
rename from libspandisc/splitter.h
rename to libs/spandisc/include/splitter.h
diff --git a/libspandisc/filehandler.c b/libs/spandisc/src/filehandler.c
similarity index 100%
rename from libspandisc/filehandler.c
rename to libs/spandisc/src/filehandler.c
diff --git a/libspandisc/logic.c b/libs/spandisc/src/logic.c
similarity index 100%
rename from libspandisc/logic.c
rename to libs/spandisc/src/logic.c
diff --git a/libspandisc/splitter.c b/libs/spandisc/src/splitter.c
similarity index 100%
rename from libspandisc/splitter.c
rename to libs/spandisc/src/splitter.c
diff --git a/discspan/discspan.c b/src/discspan.c
similarity index 100%
rename from discspan/discspan.c
rename to src/discspan.c
diff --git a/discspan/help.c b/src/help.c
similarity index 100%
rename from discspan/help.c
rename to src/help.c
diff --git a/discspan/help.h b/src/help.h
similarity index 100%
rename from discspan/help.h
rename to src/help.h
-- 
2.39.5