corpus2_whole readers has been moved to corpus2_whole/io

CMakeLists.txt

@@ -71,14 +71,15 @@ MARK_AS_ADVANCED(LIBCORPUS2_SRC_DATA_DIR)
 
 add_subdirectory(libpwrutils)
 add_subdirectory(libcorpus2)
-add_subdirectory(corpus2tools)
-add_subdirectory(tests)
+add_subdirectory(libcorpus2_whole)
 if(CORPUS2_BUILD_POLIQARP)
 	add_subdirectory(poliqarp-library)
 	add_subdirectory(poliqarp)
 else()
 	message(STATUS "Not building Poliqarp library and wrapper")
 endif(CORPUS2_BUILD_POLIQARP)
+add_subdirectory(corpus2tools)
+add_subdirectory(tests)
 
 if(CORPUS2_BUILD_SWIG)
 	FIND_PACKAGE(SWIG)

libcorpus2_whole/CMakeLists.txt

@@ -7,13 +7,13 @@ set(LIBS ${LIBS} ${LibXML++_LIBRARIES})
 
 SET(libcorpus2_whole_SRC
 	corpus.cpp
-	corpusreader.cpp
-	docreader.cpp
 	document.cpp
-	poliqarpdocumentreader.cpp
 	relation.cpp
-	relreader.cpp
-	docreaderi.h
+	io/corpusreader.cpp
+	io/docreader.cpp
+	io/docreaderi.h
+	io/poliqarpdocumentreader.cpp
+	io/relreader.cpp
 )
 
 file(GLOB_RECURSE INCS "*.h")

swig/documentreader.i

@@ -3,7 +3,7 @@
 
 %module libcorpusdocumentreader
 %{
-  #include <libcorpus2_whole/docreader.h>
+  #include <libcorpus2_whole/io/docreader.h>
 %}
 
 %include "exception.i"

swig/relationreader.i

@@ -3,7 +3,7 @@
 
 %module libcorpusrelationreader
 %{
-  #include <libcorpus2_whole/relreader.h>
+  #include <libcorpus2_whole/io/relreader.h>
 %}
 
 namespace Corpus2 {