mirror of https://github.com/Icinga/icinga2.git
Build fix for *NIX.
This commit is contained in:
parent
d5be7a0b4f
commit
27d008f1ce
|
@ -5,9 +5,10 @@ SUBDIRS = ltdl \
|
||||||
base \
|
base \
|
||||||
cJSON \
|
cJSON \
|
||||||
jsonrpc \
|
jsonrpc \
|
||||||
|
libicinga \
|
||||||
|
icinga \
|
||||||
configfilecomponent \
|
configfilecomponent \
|
||||||
configrpccomponent \
|
configrpccomponent
|
||||||
icinga
|
|
||||||
|
|
||||||
icinga2docdir = ${prefix}/doc/icinga2
|
icinga2docdir = ${prefix}/doc/icinga2
|
||||||
icinga2doc_DATA = \
|
icinga2doc_DATA = \
|
||||||
|
|
|
@ -1,17 +1,17 @@
|
||||||
## Process this file with automake to produce Makefile.in
|
## Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
pkglib_LTLIBRARIES = \
|
pkglib_LTLIBRARIES = \
|
||||||
libconfigfilecomponent.la
|
configfilecomponent.la
|
||||||
|
|
||||||
libconfigfilecomponent_la_SOURCES = \
|
configfilecomponent_la_SOURCES = \
|
||||||
configfilecomponent.cpp \
|
configfilecomponent.cpp \
|
||||||
configfilecomponent.h \
|
configfilecomponent.h \
|
||||||
i2-configfilecomponent.h
|
i2-configfilecomponent.h
|
||||||
|
|
||||||
libconfigfilecomponent_la_CXXFLAGS = -I${top_srcdir}/base \
|
configfilecomponent_la_CXXFLAGS = -I${top_srcdir}/base \
|
||||||
-I${top_srcdir}/jsonrpc \
|
-I${top_srcdir}/jsonrpc \
|
||||||
-I${top_srcdir}/cJSON
|
-I${top_srcdir}/cJSON
|
||||||
|
|
||||||
libconfigfilecomponent_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined
|
configfilecomponent_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined
|
||||||
libconfigfilecomponent_la_LIBADD = ${top_builddir}/base/libbase.la \
|
configfilecomponent_la_LIBADD = ${top_builddir}/base/libbase.la \
|
||||||
${top_builddir}/cJSON/libcJSON.la
|
${top_builddir}/cJSON/libcJSON.la
|
|
@ -1,20 +1,20 @@
|
||||||
## Process this file with automake to produce Makefile.in
|
## Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
pkglib_LTLIBRARIES = \
|
pkglib_LTLIBRARIES = \
|
||||||
libconfigrpccomponent.la
|
configrpccomponent.la
|
||||||
|
|
||||||
libconfigrpccomponent_la_SOURCES = \
|
configrpccomponent_la_SOURCES = \
|
||||||
configrpccomponent.cpp \
|
configrpccomponent.cpp \
|
||||||
configrpccomponent.h \
|
configrpccomponent.h \
|
||||||
i2-configrpccomponent.h
|
i2-configrpccomponent.h
|
||||||
|
|
||||||
libconfigrpccomponent_la_CXXFLAGS = -I${top_srcdir}/base \
|
configrpccomponent_la_CXXFLAGS = -I${top_srcdir}/base \
|
||||||
-I${top_srcdir}/jsonrpc \
|
-I${top_srcdir}/jsonrpc \
|
||||||
-I${top_srcdir}/cJSON \
|
-I${top_srcdir}/cJSON \
|
||||||
-I${top_srcdir}/icinga
|
-I${top_srcdir}/libicinga
|
||||||
|
|
||||||
libconfigrpccomponent_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined -pthread
|
configrpccomponent_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined -pthread
|
||||||
libconfigrpccomponent_la_LIBADD = ${top_builddir}/base/libbase.la \
|
configrpccomponent_la_LIBADD = ${top_builddir}/base/libbase.la \
|
||||||
${top_builddir}/jsonrpc/libjsonrpc.la \
|
${top_builddir}/jsonrpc/libjsonrpc.la \
|
||||||
${top_builddir}/cJSON/libcJSON.la \
|
${top_builddir}/cJSON/libcJSON.la \
|
||||||
${top_builddir}/icinga/icinga
|
${top_builddir}/libicinga/libicinga.la
|
||||||
|
|
|
@ -46,6 +46,7 @@ base/Makefile
|
||||||
cJSON/Makefile
|
cJSON/Makefile
|
||||||
configfilecomponent/Makefile
|
configfilecomponent/Makefile
|
||||||
configrpccomponent/Makefile
|
configrpccomponent/Makefile
|
||||||
|
libicinga/Makefile
|
||||||
icinga/Makefile
|
icinga/Makefile
|
||||||
jsonrpc/Makefile
|
jsonrpc/Makefile
|
||||||
|
|
||||||
|
|
|
@ -5,25 +5,17 @@ bin_PROGRAMS = \
|
||||||
icinga
|
icinga
|
||||||
|
|
||||||
icinga_SOURCES = \
|
icinga_SOURCES = \
|
||||||
endpoint.cpp \
|
icinga.cpp
|
||||||
endpoint.h \
|
|
||||||
endpointmanager.cpp \
|
|
||||||
endpointmanager.h \
|
|
||||||
icingaapplication.cpp \
|
|
||||||
icingaapplication.h \
|
|
||||||
i2-icinga.h \
|
|
||||||
jsonrpcendpoint.cpp \
|
|
||||||
jsonrpcendpoint.h \
|
|
||||||
virtualendpoint.cpp \
|
|
||||||
virtualendpoint.h
|
|
||||||
|
|
||||||
icinga_CFLAGS = -DI2_ICINGA_BUILD
|
icinga_CFLAGS = -DI2_ICINGALAUNCHER_BUILD
|
||||||
|
|
||||||
icinga_CXXFLAGS = -DI2_ICINGA_BUILD -I${top_srcdir}/base \
|
icinga_CXXFLAGS = -DI2_ICINGALAUNCHER_BUILD -I${top_srcdir}/base \
|
||||||
-I${top_srcdir}/jsonrpc \
|
-I${top_srcdir}/jsonrpc \
|
||||||
-I${top_srcdir}/cJSON \
|
-I${top_srcdir}/cJSON \
|
||||||
|
-I${top_srcdir}/libicinga \
|
||||||
-I${top_srcdir}
|
-I${top_srcdir}
|
||||||
|
|
||||||
icinga_LDFLAGS = $(top_builddir)/jsonrpc/libjsonrpc.la \
|
icinga_LDFLAGS = $(top_builddir)/libicinga/libicinga.la \
|
||||||
|
$(top_builddir)/jsonrpc/libjsonrpc.la \
|
||||||
$(top_builddir)/base/libbase.la \
|
$(top_builddir)/base/libbase.la \
|
||||||
${top_builddir}/cJSON/libcJSON.la
|
${top_builddir}/cJSON/libcJSON.la
|
|
@ -0,0 +1,3 @@
|
||||||
|
#include <i2-icinga.h>
|
||||||
|
|
||||||
|
SET_START_CLASS(icinga::IcingaApplication);
|
|
@ -0,0 +1,29 @@
|
||||||
|
## Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
|
|
||||||
|
pkglib_LTLIBRARIES = \
|
||||||
|
libicinga.la
|
||||||
|
|
||||||
|
libicinga_la_SOURCES = \
|
||||||
|
endpoint.cpp \
|
||||||
|
endpoint.h \
|
||||||
|
endpointmanager.cpp \
|
||||||
|
endpointmanager.h \
|
||||||
|
icingaapplication.cpp \
|
||||||
|
icingaapplication.h \
|
||||||
|
i2-icinga.h \
|
||||||
|
jsonrpcendpoint.cpp \
|
||||||
|
jsonrpcendpoint.h \
|
||||||
|
virtualendpoint.cpp \
|
||||||
|
virtualendpoint.h
|
||||||
|
|
||||||
|
libicinga_la_CFLAGS = -DI2_ICINGA_BUILD
|
||||||
|
|
||||||
|
libicinga_la_CXXFLAGS = -DI2_ICINGA_BUILD -I${top_srcdir}/base \
|
||||||
|
-I${top_srcdir}/jsonrpc \
|
||||||
|
-I${top_srcdir}/cJSON \
|
||||||
|
-I${top_srcdir}
|
||||||
|
|
||||||
|
libicinga_la_LDFLAGS = $(top_builddir)/jsonrpc/libjsonrpc.la \
|
||||||
|
$(top_builddir)/base/libbase.la \
|
||||||
|
${top_builddir}/cJSON/libcJSON.la
|
|
@ -85,7 +85,7 @@ int IcingaApplication::NewComponentHandler(ConfigObjectEventArgs::Ptr ea)
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
path = object->GetName() + ".dll";
|
path = object->GetName() + ".dll";
|
||||||
#else /* _WIN32 */
|
#else /* _WIN32 */
|
||||||
path = "lib" + object->GetName() + ".la";
|
path = object->GetName() + ".la";
|
||||||
#endif /* _WIN32 */
|
#endif /* _WIN32 */
|
||||||
|
|
||||||
// TODO: try to figure out where the component is located */
|
// TODO: try to figure out where the component is located */
|
||||||
|
@ -152,5 +152,3 @@ int IcingaApplication::DeletedRpcConnectionHandler(ConfigObjectEventArgs::Ptr ea
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
SET_START_CLASS(icinga::IcingaApplication);
|
|
Loading…
Reference in New Issue