From: Michael Friedrich Date: Sat, 15 Sep 2012 11:38:39 +0000 (+0200) Subject: compatido: fix linux builds from previous renames X-Git-Tag: v0.0.1~88 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c9ac33a324a80e4fcffbfe0a766206dfffbdb95;p=icinga2 compatido: fix linux builds from previous renames --- diff --git a/components/compatido/Makefile.am b/components/compatido/Makefile.am index 7ab30268e..9ef733811 100644 --- a/components/compatido/Makefile.am +++ b/components/compatido/Makefile.am @@ -10,11 +10,10 @@ compatido_la_SOURCES = \ compatido_la_CPPFLAGS = \ $(BOOST_CPPFLAGS) \ - -I${top_srcdir}/base \ - -I${top_srcdir}/dyn \ - -I${top_srcdir}/jsonrpc \ - -I${top_srcdir}/icinga \ - -I${top_srcdir}/cib + -I${top_srcdir}/lib/base \ + -I${top_srcdir}/lib/config \ + -I${top_srcdir}/lib/remoting \ + -I${top_srcdir}/lib/icinga compatido_la_LDFLAGS = \ $(BOOST_LDFLAGS) \ @@ -26,9 +25,8 @@ compatido_la_LDFLAGS = \ compatido_la_LIBADD = \ $(BOOST_SIGNALS_LIB) \ $(BOOST_THREAD_LIB) \ - ${top_builddir}/base/libbase.la \ - ${top_builddir}/dyn/libdyn.la \ - ${top_builddir}/jsonrpc/libjsonrpc.la \ - ${top_builddir}/icinga/libicinga.la \ - ${top_builddir}/cib/libcib.la + ${top_builddir}/lib/base/libbase.la \ + ${top_builddir}/lib/config/libconfig.la \ + ${top_builddir}/lib/remoting/libremoting.la \ + ${top_builddir}/lib/icinga/libicinga.la diff --git a/components/compatido/i2-compatido.h b/components/compatido/i2-compatido.h index aa2b4c45d..03ee929c4 100644 --- a/components/compatido/i2-compatido.h +++ b/components/compatido/i2-compatido.h @@ -28,9 +28,8 @@ */ #include -#include +#include #include -#include using std::stringstream;