summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-06-19 20:07:21 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-06-20 17:07:28 (GMT)
commita1adb3a394f7d1d0a08406c9ad16909348e3e6c1 (patch)
treeeacc583b0083049218be40404bced8e8e984c836 /src
parent87a0cdd2f5b0d27badac3e5055b8d6fbabd924c9 (diff)
downloadlibkolabxml-a1adb3a394f7d1d0a08406c9ad16909348e3e6c1.tar.gz
Moved containers to subdirectory.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt33
-rw-r--r--src/containers/incidence_p.h (renamed from src/incidence_p.h)0
-rw-r--r--src/containers/kolabconfiguration.cpp (renamed from src/kolabconfiguration.cpp)0
-rw-r--r--src/containers/kolabconfiguration.h (renamed from src/kolabconfiguration.h)0
-rw-r--r--src/containers/kolabcontact.cpp (renamed from src/kolabcontact.cpp)0
-rw-r--r--src/containers/kolabcontact.h (renamed from src/kolabcontact.h)0
-rw-r--r--src/containers/kolabcontainers.cpp (renamed from src/kolabcontainers.cpp)0
-rw-r--r--src/containers/kolabcontainers.h (renamed from src/kolabcontainers.h)0
-rw-r--r--src/containers/kolabevent.cpp (renamed from src/kolabevent.cpp)0
-rw-r--r--src/containers/kolabevent.h (renamed from src/kolabevent.h)0
-rw-r--r--src/containers/kolabevent_p.h (renamed from src/kolabevent_p.h)0
-rw-r--r--src/containers/kolabjournal.cpp (renamed from src/kolabjournal.cpp)0
-rw-r--r--src/containers/kolabjournal.h (renamed from src/kolabjournal.h)0
-rw-r--r--src/containers/kolabnote.cpp (renamed from src/kolabnote.cpp)0
-rw-r--r--src/containers/kolabnote.h (renamed from src/kolabnote.h)0
-rw-r--r--src/containers/kolabtodo.cpp (renamed from src/kolabtodo.cpp)0
-rw-r--r--src/containers/kolabtodo.h (renamed from src/kolabtodo.h)0
-rw-r--r--src/kolabformat.i28
18 files changed, 37 insertions, 24 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2f635d6..a203450 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,7 +5,20 @@ SET_SOURCE_FILES_PROPERTIES(${SCHEMA_SOURCEFILES} PROPERTIES GENERATED 1)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wp,-D_FORTIFY_SOURCE=2 -O2" ) #always generate shared libraries with -fPIC, -D_FORTIFY_SOURCE=2 enables some extra checking
# Library with serialization/deserialization code and kolab-containers
-add_library(kolabxml SHARED kolabformat.cpp kolabcontainers.cpp kolabnote.cpp kolabevent.cpp kolabtodo.cpp kolabjournal.cpp kolabcontact.cpp kolabconfiguration.cpp utils.cpp base64.cpp ../compiled/XMLParserWrapper.cpp ../compiled/grammar-input-stream.cxx ${SCHEMA_SOURCEFILES})
+add_library(kolabxml SHARED
+ kolabformat.cpp
+ containers/kolabcontainers.cpp
+ containers/kolabnote.cpp
+ containers/kolabevent.cpp
+ containers/kolabtodo.cpp
+ containers/kolabjournal.cpp
+ containers/kolabcontact.cpp
+ containers/kolabconfiguration.cpp
+ utils.cpp base64.cpp
+ ../compiled/XMLParserWrapper.cpp
+ ../compiled/grammar-input-stream.cxx
+ ${SCHEMA_SOURCEFILES}
+)
add_dependencies(kolabxml generate_bindings)
target_link_libraries(kolabxml ${XERCES_C} ${Boost_LIBRARIES} ${UUID})
@@ -30,15 +43,15 @@ install(TARGETS kolabxml EXPORT LibkolabxmlExport
install( FILES
kolabformat.h
- kolabevent.h
- kolabevent_p.h
- incidence_p.h
- kolabtodo.h
- kolabjournal.h
- kolabcontact.h
- kolabnote.h
- kolabcontainers.h
- kolabconfiguration.h
+ containers/kolabevent.h
+ containers/kolabevent_p.h
+ containers/incidence_p.h
+ containers/kolabtodo.h
+ containers/kolabjournal.h
+ containers/kolabcontact.h
+ containers/kolabnote.h
+ containers/kolabcontainers.h
+ containers/kolabconfiguration.h
global_definitions.h
DESTINATION ${INCLUDE_INSTALL_DIR})
diff --git a/src/incidence_p.h b/src/containers/incidence_p.h
index 8602feb..8602feb 100644
--- a/src/incidence_p.h
+++ b/src/containers/incidence_p.h
diff --git a/src/kolabconfiguration.cpp b/src/containers/kolabconfiguration.cpp
index 2129371..2129371 100644
--- a/src/kolabconfiguration.cpp
+++ b/src/containers/kolabconfiguration.cpp
diff --git a/src/kolabconfiguration.h b/src/containers/kolabconfiguration.h
index d29ff1e..d29ff1e 100644
--- a/src/kolabconfiguration.h
+++ b/src/containers/kolabconfiguration.h
diff --git a/src/kolabcontact.cpp b/src/containers/kolabcontact.cpp
index 528b13d..528b13d 100644
--- a/src/kolabcontact.cpp
+++ b/src/containers/kolabcontact.cpp
diff --git a/src/kolabcontact.h b/src/containers/kolabcontact.h
index 86306ba..86306ba 100644
--- a/src/kolabcontact.h
+++ b/src/containers/kolabcontact.h
diff --git a/src/kolabcontainers.cpp b/src/containers/kolabcontainers.cpp
index 47c76e3..47c76e3 100644
--- a/src/kolabcontainers.cpp
+++ b/src/containers/kolabcontainers.cpp
diff --git a/src/kolabcontainers.h b/src/containers/kolabcontainers.h
index 5f8318d..5f8318d 100644
--- a/src/kolabcontainers.h
+++ b/src/containers/kolabcontainers.h
diff --git a/src/kolabevent.cpp b/src/containers/kolabevent.cpp
index f70346a..f70346a 100644
--- a/src/kolabevent.cpp
+++ b/src/containers/kolabevent.cpp
diff --git a/src/kolabevent.h b/src/containers/kolabevent.h
index abec9a9..abec9a9 100644
--- a/src/kolabevent.h
+++ b/src/containers/kolabevent.h
diff --git a/src/kolabevent_p.h b/src/containers/kolabevent_p.h
index 66054d3..66054d3 100644
--- a/src/kolabevent_p.h
+++ b/src/containers/kolabevent_p.h
diff --git a/src/kolabjournal.cpp b/src/containers/kolabjournal.cpp
index ce37fbc..ce37fbc 100644
--- a/src/kolabjournal.cpp
+++ b/src/containers/kolabjournal.cpp
diff --git a/src/kolabjournal.h b/src/containers/kolabjournal.h
index 9a904d3..9a904d3 100644
--- a/src/kolabjournal.h
+++ b/src/containers/kolabjournal.h
diff --git a/src/kolabnote.cpp b/src/containers/kolabnote.cpp
index c7931bb..c7931bb 100644
--- a/src/kolabnote.cpp
+++ b/src/containers/kolabnote.cpp
diff --git a/src/kolabnote.h b/src/containers/kolabnote.h
index 6edffb6..6edffb6 100644
--- a/src/kolabnote.h
+++ b/src/containers/kolabnote.h
diff --git a/src/kolabtodo.cpp b/src/containers/kolabtodo.cpp
index ceefcf9..ceefcf9 100644
--- a/src/kolabtodo.cpp
+++ b/src/containers/kolabtodo.cpp
diff --git a/src/kolabtodo.h b/src/containers/kolabtodo.h
index ce547e3..ce547e3 100644
--- a/src/kolabtodo.h
+++ b/src/containers/kolabtodo.h
diff --git a/src/kolabformat.i b/src/kolabformat.i
index 25f7428..5776f96 100644
--- a/src/kolabformat.i
+++ b/src/kolabformat.i
@@ -7,13 +7,13 @@
#include "global_definitions.h"
#include "kolabformat.h"
- #include "kolabcontainers.h"
- #include "kolabevent.h"
- #include "kolabtodo.h"
- #include "kolabjournal.h"
- #include "kolabcontact.h"
- #include "kolabnote.h"
- #include "kolabconfiguration.h"
+ #include "containers/kolabcontainers.h"
+ #include "containers/kolabevent.h"
+ #include "containers/kolabtodo.h"
+ #include "containers/kolabjournal.h"
+ #include "containers/kolabcontact.h"
+ #include "containers/kolabnote.h"
+ #include "containers/kolabconfiguration.h"
%}
%include "std_string.i"
@@ -40,11 +40,11 @@ namespace std {
};
%include "global_definitions.h"
-%include "kolabcontainers.h"
-%include "kolabevent.h"
-%include "kolabtodo.h"
-%include "kolabjournal.h"
-%include "kolabcontact.h"
-%include "kolabnote.h"
%include "kolabformat.h"
-%include "kolabconfiguration.h"
+%include "containers/kolabcontainers.h"
+%include "containers/kolabevent.h"
+%include "containers/kolabtodo.h"
+%include "containers/kolabjournal.h"
+%include "containers/kolabcontact.h"
+%include "containers/kolabnote.h"
+%include "containers/kolabconfiguration.h"