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

.gitignore

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

configrpccomponent/Makefile.am

@@ -11,10 +11,10 @@ configrpccomponent_la_SOURCES =  \
 configrpccomponent_la_CXXFLAGS = -I${top_srcdir}/base \
 	-I${top_srcdir}/jsonrpc \
 	-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_LIBADD = ${top_builddir}/base/libbase.la \
 	${top_builddir}/jsonrpc/libjsonrpc.la \
 	${top_builddir}/cJSON/libcJSON.la \
-	${top_builddir}/libicinga/libicinga.la
+	${top_builddir}/icinga/libicinga.la

icinga-app/Makefile.am

@@ -12,10 +12,10 @@ icinga_CFLAGS = -DI2_ICINGALAUNCHER_BUILD
 icinga_CXXFLAGS = -DI2_ICINGALAUNCHER_BUILD -I${top_srcdir}/base \
 	-I${top_srcdir}/jsonrpc \
 	-I${top_srcdir}/cJSON \
-	-I${top_srcdir}/libicinga \
+	-I${top_srcdir}/icinga \
 	-I${top_srcdir}
 
-icinga_LDFLAGS = $(top_builddir)/libicinga/libicinga.la \
+icinga_LDFLAGS = $(top_builddir)/icinga/libicinga.la \
 	$(top_builddir)/jsonrpc/libjsonrpc.la \
 	$(top_builddir)/base/libbase.la \
 	${top_builddir}/cJSON/libcJSON.la