change: not seperate include

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fd2e5053a45ed4924e412ceafe2b115866ae6de..72b17d794b37737d6ff688ec2da7a390ebf901ee 100644 (file)
--- 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 df6a08c854f0e0e9049ed48d93df76ae7f8ee5fa..ad0d097f188835f7a8c1b240fbbc1846601ce2b0 100644 (file)
--- a/discspan/discspan.c
+++ b/discspan/discspan.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#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 (file)
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