From: Bastian Dehn Date: Fri, 13 Aug 2021 04:46:14 +0000 (+0200) Subject: change: not seperate include X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=d45b715895679713e0d4f0d4916f548882ee6bb4;p=discspan.git change: not seperate include --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fd2e50..72b17d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,13 +12,12 @@ project(discspan) if (SHAREDLIB) file(GLOB SOURCES discspan/*.c) file(GLOB SOURCE_LIB libspandisc/*.c) - include_directories(include) file(GLOB PUBLIC_HEADER libspandisc/*.h) add_library(spandisc SHARED ${SOURCE_LIB}) set_target_properties(spandisc PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADER}") else() - file(GLOB SOURCES discspan/*.c libspandisc/*.c) + file(GLOB SOURCES discspan/*.c libspandisc/*.c discspan/*.h) include_directories(include) endif() diff --git a/discspan/discspan.c b/discspan/discspan.c index df6a08c..ad0d097 100644 --- a/discspan/discspan.c +++ b/discspan/discspan.c @@ -2,7 +2,7 @@ #include #include -#include "libspandisc.h" +#include "../libspandisc/spandisc.h" #include "help.h" extern void useage(); diff --git a/include/libspandisc.h b/include/libspandisc.h deleted file mode 100644 index fdc1960..0000000 --- a/include/libspandisc.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef LIBSPANDISC_H -#define LIBSPANDISC_H - -#include "../libspandisc/spandisc.h" -#include "../libspandisc/logic.h" -#include "../libspandisc/splitter.h" -#include "../libspandisc/filehandler.h" - -#endif