[icinga-checkins] icinga.org: icinga2/master: Make libido a library, rather than a user-loadable module.

git at icinga.org git at icinga.org
Tue Jul 16 10:41:11 CEST 2013


Module: icinga2
Branch: master
Commit: 81b3b57b11b0b8f61bbdb151f47cfdc706067825
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=81b3b57b11b0b8f61bbdb151f47cfdc706067825

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Tue Jul 16 10:40:55 2013 +0200

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

---

 components/Makefile.am                      |    1 -
 components/ido_log/Makefile.am              |    3 ++-
 components/ido_mysql/Makefile.am            |    3 ++-
 configure.ac                                |    2 +-
 lib/Makefile.am                             |    1 +
 {components => lib}/ido/Makefile.am         |    4 +---
 {components => lib}/ido/dbconnection.cpp    |    0
 {components => lib}/ido/dbconnection.h      |    3 ---
 {components => lib}/ido/dbobject.cpp        |    0
 {components => lib}/ido/dbobject.h          |    0
 {components => lib}/ido/dbreference.cpp     |    0
 {components => lib}/ido/dbreference.h       |    0
 {components => lib}/ido/dbtype.cpp          |    0
 {components => lib}/ido/dbtype.h            |    0
 {components => lib}/ido/hostdbobject.cpp    |    0
 {components => lib}/ido/hostdbobject.h      |    0
 {components => lib}/ido/ido-type.conf       |    0
 {components => lib}/ido/ido.vcxproj         |    0
 {components => lib}/ido/ido.vcxproj.filters |    0
 19 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/components/Makefile.am b/components/Makefile.am
index 24f5230..b49409e 100644
--- 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 336ddd1..6cb07b2 100644
--- 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 0c66d15..15d82c8 100644
--- 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 62cf7e7..93273da 100644
--- 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 442f205..4a5ece4 100644
--- 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 d5d19f9..85e27e1 100644
--- 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 3882682..c153c8f 100644
--- 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





More information about the icinga-checkins mailing list