Make libido a library, rather than a user-loadable module.

diff --git a/components/Makefile.am b/components/Makefile.am
index 24f5230e440ab551647d9d78fd97774ed3716975..b49409e383ebe0d3b8a63cfa4bdab56654d0deee 100644 (file)
--- a/components/Makefile.am
+++ b/components/Makefile.am
@@ -6,7 +6,6 @@ SUBDIRS = \
        compat \
        delegation \
        demo \
-       ido \
        ido_log \
        ido_mysql \
        livestatus \

diff --git a/components/ido_log/Makefile.am b/components/ido_log/Makefile.am
index 336ddd19ba9eead5681543af98757b63b22053d8..6cb07b2912367f4c8a6dc7f8601ce5c00f14a735 100644 (file)
--- a/components/ido_log/Makefile.am
+++ b/components/ido_log/Makefile.am
@@ -34,4 +34,5 @@ libido_log_la_LIBADD = \
        ${top_builddir}/lib/base/libbase.la \
        ${top_builddir}/lib/config/libconfig.la \
        ${top_builddir}/lib/remoting/libremoting.la \
-       ${top_builddir}/lib/icinga/libicinga.la
+       ${top_builddir}/lib/icinga/libicinga.la \
+       ${top_builddir}/lib/ido/libido.la

diff --git a/components/ido_mysql/Makefile.am b/components/ido_mysql/Makefile.am
index 0c66d152504bea389bcaaf10bf3cf16b5da4f2ad..15d82c8740dc4b6322d66b81fd3e9730b67d23cf 100644 (file)
--- a/components/ido_mysql/Makefile.am
+++ b/components/ido_mysql/Makefile.am
@@ -34,4 +34,5 @@ libido_mysql_la_LIBADD = \
        ${top_builddir}/lib/base/libbase.la \
        ${top_builddir}/lib/config/libconfig.la \
        ${top_builddir}/lib/remoting/libremoting.la \
-       ${top_builddir}/lib/icinga/libicinga.la
+       ${top_builddir}/lib/icinga/libicinga.la \
+       ${top_builddir}/lib/ido/libido.la

diff --git a/configure.ac b/configure.ac
index 62cf7e7d4f3ec5097e7d3a4a3c28a9bf543f2235..93273da148c245a22021ae7814914ae1280b4a1c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -122,7 +122,6 @@ components/checker/Makefile
 components/compat/Makefile
 components/delegation/Makefile
 components/demo/Makefile
-components/ido/Makefile
 components/ido_log/Makefile
 components/ido_mysql/Makefile
 components/livestatus/Makefile
@@ -139,6 +138,7 @@ lib/Makefile
 lib/base/Makefile
 lib/config/Makefile
 lib/icinga/Makefile
+lib/ido/Makefile
 lib/python/Makefile
 lib/remoting/Makefile
 test/Makefile

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 442f2058ab63aee1ed6df86228fb37a496d41e57..4a5ece41c24f17c23c684f18aad3f5c336f97e01 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,4 +6,5 @@ SUBDIRS = \
        config \
        remoting \
        icinga \
+       ido \
        python

diff --git a/components/ido/Makefile.am b/lib/ido/Makefile.am
similarity index 93%
rename from components/ido/Makefile.am
rename to lib/ido/Makefile.am
index d5d19f9e4c2b7d5f1b45f1c5ac5864f2701ab36e..85e27e1b5bba854d0a20c513e0dd8d5b775924c3 100644 (file)
--- a/components/ido/Makefile.am
+++ b/lib/ido/Makefile.am
@@ -25,12 +25,10 @@ libido_la_SOURCES = \
 libido_la_CPPFLAGS = \
        $(LTDLINCL) \
        $(BOOST_CPPFLAGS) \
-       -I${top_srcdir}/lib \
-       -I${top_srcdir}/components
+       -I${top_srcdir}/lib
 
 libido_la_LDFLAGS = \
        $(BOOST_LDFLAGS) \
-       -module \
        -no-undefined \
        @RELEASE_INFO@ \
        @VERSION_INFO@

diff --git a/components/ido/dbconnection.cpp b/lib/ido/dbconnection.cpp
similarity index 100%
rename from components/ido/dbconnection.cpp
rename to lib/ido/dbconnection.cpp

diff --git a/components/ido/dbconnection.h b/lib/ido/dbconnection.h
similarity index 93%
rename from components/ido/dbconnection.h
rename to lib/ido/dbconnection.h
index 38826828dca8e35ec187a5fec77bdbcd7e744482..c153c8f9a409c2608633957c86f11b406a18747f 100644 (file)
--- a/components/ido/dbconnection.h
+++ b/lib/ido/dbconnection.h
@@ -49,9 +49,6 @@ protected:
 private:
        void Initialize(void);
 
-       static void ObjectRegisteredHandler(const DynamicObject::Ptr& object);
-       static void ObjectUnregisteredHandler(const DynamicObject::Ptr& object);
-
        std::map<DbObject::Ptr, DbReference> m_References;
 };
 

diff --git a/components/ido/dbobject.cpp b/lib/ido/dbobject.cpp
similarity index 100%
rename from components/ido/dbobject.cpp
rename to lib/ido/dbobject.cpp

diff --git a/components/ido/dbobject.h b/lib/ido/dbobject.h
similarity index 100%
rename from components/ido/dbobject.h
rename to lib/ido/dbobject.h

diff --git a/components/ido/dbreference.cpp b/lib/ido/dbreference.cpp
similarity index 100%
rename from components/ido/dbreference.cpp
rename to lib/ido/dbreference.cpp

diff --git a/components/ido/dbreference.h b/lib/ido/dbreference.h
similarity index 100%
rename from components/ido/dbreference.h
rename to lib/ido/dbreference.h

diff --git a/components/ido/dbtype.cpp b/lib/ido/dbtype.cpp
similarity index 100%
rename from components/ido/dbtype.cpp
rename to lib/ido/dbtype.cpp

diff --git a/components/ido/dbtype.h b/lib/ido/dbtype.h
similarity index 100%
rename from components/ido/dbtype.h
rename to lib/ido/dbtype.h

diff --git a/components/ido/hostdbobject.cpp b/lib/ido/hostdbobject.cpp
similarity index 100%
rename from components/ido/hostdbobject.cpp
rename to lib/ido/hostdbobject.cpp

diff --git a/components/ido/hostdbobject.h b/lib/ido/hostdbobject.h
similarity index 100%
rename from components/ido/hostdbobject.h
rename to lib/ido/hostdbobject.h

diff --git a/components/ido/ido-type.conf b/lib/ido/ido-type.conf
similarity index 100%
rename from components/ido/ido-type.conf
rename to lib/ido/ido-type.conf

diff --git a/components/ido/ido.vcxproj b/lib/ido/ido.vcxproj
similarity index 100%
rename from components/ido/ido.vcxproj
rename to lib/ido/ido.vcxproj

diff --git a/components/ido/ido.vcxproj.filters b/lib/ido/ido.vcxproj.filters
similarity index 100%
rename from components/ido/ido.vcxproj.filters
rename to lib/ido/ido.vcxproj.filters