From: Bastian Dehn Date: Fri, 13 Aug 2021 21:50:50 +0000 (+0200) Subject: change: compile with shared lib subdir X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=35b8d329a9e286f83d202909554141eb2dc16071;p=discspan.git change: compile with shared lib subdir --- 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/discspan/discspan.c b/discspan/discspan.c deleted file mode 100644 index df1c561..0000000 --- a/discspan/discspan.c +++ /dev/null @@ -1,101 +0,0 @@ -#include -#include -#include - -#include "spandisc.h" -#include "logic.h" -#include "help.h" - -typedef struct { - char *input; - char *output; - unsigned long long split; -} param_t; - -param_t readArgument(int argc, char *argv[]) -{ - param_t parameter = { NULL, NULL, 0 }; - - // Medien groessen - const unsigned long long bluray = 24159191040; - const unsigned long long dvd9 = 8500000000; - const unsigned long long dvd5 = 4700000000; - const unsigned long long cd = 734003200; - - int c = 0; - while ((c = getopt(argc, argv, ":59bcf:hi:o:")) != -1) { - switch (c) { - case 'i': - parameter.input = optarg; - break; - case 'o': - parameter.output = optarg; - break; - case '5': - parameter.split = dvd5; - break; - case '9': - parameter.split = dvd9; - break; - case 'b': - parameter.split = bluray; - break; - case 'c': - parameter.split = cd; - break; - case 'f': - parameter.split = atoll(optarg); - break; - case 'h': - useage(); - exit(0); - break; - default: - printf("WARNUNG: Parameter -%c unbekannt!\n", optopt); - break; - } - } - - return parameter; -} - -void print_human_read_size(const char *output, medium_t medium) -{ - unsigned long long humanread; - char einheit[6] = {'B', 'K', 'M', 'G', 'T', 'P'}; - int i = 0; - - humanread = medium.freespace; - while (humanread >= 1024) { - humanread /= 1024; - i++; - } - - if (i > sizeof(einheit)/sizeof(einheit[0])) - i = 0; - - printf("Restlicher Platz in Bytes(%s): %lld (%lld %c)\n", output, - medium.freespace, humanread, einheit[i]); -} - -int main(int argc, char *argv[]) -{ - param_t parameter = readArgument(argc, argv); - - if (parameter.input == NULL - || parameter.output == NULL - || parameter.split < 2048) { - useage(); - exit(1); - } - - if (access(parameter.input, F_OK) < 0) { - printf("ERROR: %s existiert nicht!\n", parameter.input); - exit(1); - } - - status_print = print_human_read_size; - span(parameter.input, parameter.output, parameter.split); - - return 0; -} diff --git a/discspan/help.c b/discspan/help.c deleted file mode 100644 index eb018f0..0000000 --- a/discspan/help.c +++ /dev/null @@ -1,16 +0,0 @@ -#include -#include "help.h" - -void useage() -{ - printf("\nUsage: discspan