tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed *NIX build

This commit is contained in:
Gunnar Beutner 2012-04-06 09:10:22 +02:00
parent 390a00e546
commit 04472c5a85
7 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/Makefile.am
View File

@ -50,5 +50,5 @@ libbase_la_SOURCES = \
libbase_la_LIBADD=$(LIBLTDL) libbase_la_LIBADD=$(LIBLTDL)
AM_CFLAGS=$(LTDLINCL) libbase_la_CFLAGS=$(LTDLINCL) -DI2_BASE_BUILD
AM_CXXFLAGS=$(LTDLINCL) libbase_la_CXXFLAGS=$(LTDLINCL) -DI2_BASE_BUILD

2
base/application.cpp
View File

@ -386,7 +386,7 @@ int application_main(int argc, char **argv, Application::Ptr instance)
#ifndef _WIN32 #ifndef _WIN32
struct sigaction sa; struct sigaction sa;
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));
sa.sa_handler = sigint_handler; sa.sa_handler = application_sigint_handler;
sigaction(SIGINT, &sa, NULL); sigaction(SIGINT, &sa, NULL);
#endif /* _WIN32 */ #endif /* _WIN32 */

7
configfilecomponent/Makefile.am
View File

@ -8,7 +8,10 @@ libconfigfilecomponent_la_SOURCES = \
configfilecomponent.h \ configfilecomponent.h \
i2-configfilecomponent.h i2-configfilecomponent.h
libconfigfilecomponent_la_CXXFLAGS = -I${top_srcdir}/base -I${top_srcdir}/jsonrpc libconfigfilecomponent_la_CXXFLAGS = -I${top_srcdir}/base \
-I${top_srcdir}/jsonrpc \
-I${top_srcdir}/cJSON
libconfigfilecomponent_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined libconfigfilecomponent_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined
libconfigfilecomponent_la_LIBADD = ${top_builddir}/base/libbase.la ${top_builddir}/cJSON/libcJSON.la libconfigfilecomponent_la_LIBADD = ${top_builddir}/base/libbase.la \
${top_builddir}/cJSON/libcJSON.la

5
configrpccomponent/Makefile.am
View File

@ -8,7 +8,10 @@ libconfigrpccomponent_la_SOURCES = \
configrpccomponent.h \ configrpccomponent.h \
i2-configrpccomponent.h i2-configrpccomponent.h
libconfigrpccomponent_la_CXXFLAGS = -I${top_srcdir}/base -I${top_srcdir}/jsonrpc -I${top_srcdir}/icinga libconfigrpccomponent_la_CXXFLAGS = -I${top_srcdir}/base \
-I${top_srcdir}/jsonrpc \
-I${top_srcdir}/cJSON \
-I${top_srcdir}/icinga
libconfigrpccomponent_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined -pthread libconfigrpccomponent_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined -pthread
libconfigrpccomponent_la_LIBADD = ${top_builddir}/base/libbase.la \ libconfigrpccomponent_la_LIBADD = ${top_builddir}/base/libbase.la \

4
icinga/Makefile.am
View File

@ -18,7 +18,9 @@ icinga_SOURCES = \
virtualendpoint.h virtualendpoint.h
icinga_CXXFLAGS = -I${top_srcdir}/base \ icinga_CXXFLAGS = -I${top_srcdir}/base \
-I${top_srcdir}/jsonrpc -I${top_srcdir} -I${top_srcdir}/jsonrpc \
-I${top_srcdir}/cJSON \
-I${top_srcdir}
icinga_LDFLAGS = $(top_builddir)/jsonrpc/libjsonrpc.la \ icinga_LDFLAGS = $(top_builddir)/jsonrpc/libjsonrpc.la \
$(top_builddir)/base/libbase.la \ $(top_builddir)/base/libbase.la \

2
icinga/endpointmanager.cpp
View File

@ -124,7 +124,7 @@ void EndpointManager::UnregisterEndpoint(Endpoint::Ptr endpoint)
void EndpointManager::SendMessage(Endpoint::Ptr source, Endpoint::Ptr destination, JsonRpcMessage::Ptr message) void EndpointManager::SendMessage(Endpoint::Ptr source, Endpoint::Ptr destination, JsonRpcMessage::Ptr message)
{ {
if (destination) { if (destination) {
destination->SendMessageA(source, message); destination->SendMessage(source, message);
} else { } else {
for (list<Endpoint::Ptr>::iterator i = m_Endpoints.begin(); i != m_Endpoints.end(); i++) for (list<Endpoint::Ptr>::iterator i = m_Endpoints.begin(); i != m_Endpoints.end(); i++)
{ {

4
jsonrpc/Makefile.am
View File

@ -15,4 +15,6 @@ libjsonrpc_la_SOURCES = \
netstring.cpp \ netstring.cpp \
netstring.h netstring.h
libjsonrpc_la_CXXFLAGS = -I${top_srcdir}/base libjsonrpc_la_CFLAGS = -DI2_JSONRPC_BUILD
libjsonrpc_la_CXXFLAGS = -DI2_JSONRPC_BUILD -I${top_srcdir}/base \
-I${top_srcdir}/cJSON