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

Merge branch 'master' of ssh://github.com/gunnarbeutner/i2test

This commit is contained in:
Gunnar Beutner 2012-04-13 11:58:28 +02:00
parent 90796b5b6b 44136cf4d0
commit 6d70d399de
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -34,4 +34,4 @@ ltmain.sh
missing missing
stamp-h1 stamp-h1
.libs .libs
icinga/icinga icinga-app/icinga

4
configrpccomponent/Makefile.am
View File

@ -11,10 +11,10 @@ configrpccomponent_la_SOURCES = \
configrpccomponent_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}/libicinga -I${top_srcdir}/icinga
configrpccomponent_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined -pthread configrpccomponent_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined -pthread
configrpccomponent_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}/libicinga/libicinga.la ${top_builddir}/icinga/libicinga.la

4
icinga-app/Makefile.am
View File

@ -12,10 +12,10 @@ icinga_CFLAGS = -DI2_ICINGALAUNCHER_BUILD
icinga_CXXFLAGS = -DI2_ICINGALAUNCHER_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}/icinga \
-I${top_srcdir} -I${top_srcdir}
icinga_LDFLAGS = $(top_builddir)/libicinga/libicinga.la \ icinga_LDFLAGS = $(top_builddir)/icinga/libicinga.la \
$(top_builddir)/jsonrpc/libjsonrpc.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