Build fixes.

diff --git a/Makefile.am b/Makefile.am
index 71442f08edab31a29e89b42aa84ae90856d0a164..ac6bea37f6c5387280e099f4a108f9b26a7b1109 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,8 +7,7 @@ SUBDIRS = ltdl \
        jsonrpc \
        icinga \
        icinga-app \
-       configfilecomponent \
-       configrpccomponent
+       components
 
 icinga2docdir = ${prefix}/doc/icinga2
 icinga2doc_DATA = \

diff --git a/components/Makefile.am b/components/Makefile.am
index 846d3a48d20fbe54258bdcfd0168385e3b9f6d3a..e32fb4b854d5c34cc2639b495baa40ed8bbe70af 100644 (file)
--- a/components/Makefile.am
+++ b/components/Makefile.am
@@ -2,4 +2,4 @@
 ## Created by Anjuta
 
 SUBDIRS = configfile \
-       configrpc
\ No newline at end of file
+       configrpc

diff --git a/components/configfile/Makefile.am b/components/configfile/Makefile.am
index 2fb90b2396f9ad95aaa931c2ac565c46cce9bdb7..75c2df6afb95fef4311db8d7eef505f80200ca47 100644 (file)
--- a/components/configfile/Makefile.am
+++ b/components/configfile/Makefile.am
@@ -4,8 +4,8 @@ pkglib_LTLIBRARIES =  \
        configfile.la
 
 configfile_la_SOURCES =  \
-       configfile.cpp \
-       configfile.h \
+       configfilecomponent.cpp \
+       configfilecomponent.h \
        i2-configfile.h
 
 configfile_la_CXXFLAGS = -I${top_srcdir}/base \

diff --git a/components/configfile/configfile.vcxproj b/components/configfile/configfile.vcxproj
index ea027953d2bda7e8d0ad268c7522b3012112af28..d21122a56939236e613f1d50bffe6ef1e1cc6ff8 100644 (file)
--- a/components/configfile/configfile.vcxproj
+++ b/components/configfile/configfile.vcxproj
@@ -45,11 +45,11 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(ProjectDir)\..\base;$(ProjectDir)\..\cJSON;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\cJSON;$(IncludePath)</IncludePath>
     <LibraryPath>$(OutDir);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(ProjectDir)\..\base;$(ProjectDir)\..\cJSON;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\cJSON;$(IncludePath)</IncludePath>
     <LibraryPath>$(OutDir);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/components/configfile/configfilecomponent.cpp b/components/configfile/configfilecomponent.cpp
index 467ebee767c924a8fdfdba9b478ffc58c0758f40..d0bf7d051b952f377e54918ee7d6dfa278948b24 100644 (file)
--- a/components/configfile/configfilecomponent.cpp
+++ b/components/configfile/configfilecomponent.cpp
@@ -1,7 +1,7 @@
-#include "i2-configfilecomponent.h"
-#include <cJSON.h>
 #include <iostream>
 #include <fstream>
+#include "i2-configfile.h"
+#include "cJSON.h"
 
 using namespace icinga;
 

diff --git a/components/configrpc/configrpc.vcxproj b/components/configrpc/configrpc.vcxproj
index 11c0c2779e52dbf26e86e65a0a445e6ddabdfaa2..ac93b490f97ac4b4ef1e4e45d6d602c2a3d56e98 100644 (file)
--- a/components/configrpc/configrpc.vcxproj
+++ b/components/configrpc/configrpc.vcxproj
@@ -46,12 +46,12 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)\..\base;$(ProjectDir)\..\jsonrpc;$(ProjectDir)\..\icinga;$(ProjectDir)\..\cJSON;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cJSON;$(IncludePath)</IncludePath>
     <LibraryPath>$(OutDir);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir)\..\base;$(ProjectDir)\..\jsonrpc;$(ProjectDir)\..\icinga;$(ProjectDir)\..\cJSON;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cJSON;$(IncludePath)</IncludePath>
     <LibraryPath>$(OutDir);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/components/configrpc/configrpccomponent.cpp b/components/configrpc/configrpccomponent.cpp
index 1c6803554ee10adb070829c05b88ffb4e067dad8..2f6d882829e76b4ccee995e75f639ba6c92e3b8c 100644 (file)
--- a/components/configrpc/configrpccomponent.cpp
+++ b/components/configrpc/configrpccomponent.cpp
@@ -1,4 +1,4 @@
-#include "i2-configrpccomponent.h"
+#include "i2-configrpc.h"
 
 using namespace icinga;
 

diff --git a/configure.ac b/configure.ac
index c811fe7ae35f4bc2027b0ecdf5560ecb3e7f7e0c..70e549fa85a8186628610dcaae66a53aacf33023 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,8 +44,9 @@ AC_OUTPUT([
 Makefile
 base/Makefile
 cJSON/Makefile
-configfilecomponent/Makefile
-configrpccomponent/Makefile
+components/Makefile
+components/configfile/Makefile
+components/configrpc/Makefile
 icinga/Makefile
 icinga-app/Makefile
 jsonrpc/Makefile

diff --git a/icinga-app/icinga-app.vcxproj b/icinga-app/icinga-app.vcxproj
index 1091d7d86095dd49722988e0e3481975cbdabc86..077bd72ceda7cb189e452ddac7036e6f8cce7f6c 100644 (file)
--- a/icinga-app/icinga-app.vcxproj
+++ b/icinga-app/icinga-app.vcxproj
@@ -43,12 +43,12 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)\..\base;$(ProjectDir)\..\jsonrpc;$(ProjectDir)\..\cJSON;$(ProjectDir)\..\icinga;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\cJSON;$(SolutionDir)\icinga;$(IncludePath)</IncludePath>
     <LibraryPath>$(OutDir);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir)\..\base;$(ProjectDir)\..\jsonrpc;$(ProjectDir)\..\cJSON;$(ProjectDir)\..\icinga;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\cJSON;$(SolutionDir)\icinga;$(IncludePath)</IncludePath>
     <LibraryPath>$(OutDir);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/icinga/icinga.vcxproj b/icinga/icinga.vcxproj
index 7f131b0edbc99fd18d910ff0a110fc71d0cefe81..9457eed4ee5c8fbddd09dbce611b8dffcceae11f 100644 (file)
--- a/icinga/icinga.vcxproj
+++ b/icinga/icinga.vcxproj
@@ -55,12 +55,12 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)\..\base;$(ProjectDir)\..\jsonrpc;$(ProjectDir)\..\cJSON;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\cJSON;$(IncludePath)</IncludePath>
     <LibraryPath>$(OutDir);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir)\..\base;$(ProjectDir)\..\jsonrpc;$(ProjectDir)\..\cJSON;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\cJSON;$(IncludePath)</IncludePath>
     <LibraryPath>$(OutDir);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/jsonrpc/jsonrpc.vcxproj b/jsonrpc/jsonrpc.vcxproj
index d009f244a9ff171c10a7a91275ca4da170595ba5..c1d632b7513aa6faa18d46dcc64baef3afa3aa8d 100644 (file)
--- a/jsonrpc/jsonrpc.vcxproj
+++ b/jsonrpc/jsonrpc.vcxproj
@@ -51,11 +51,11 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(ProjectDir)\..\base;$(ProjectDir)\..\cJSON;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\cJSON;$(IncludePath)</IncludePath>
     <LibraryPath>$(OutDir);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(ProjectDir)\..\base;$(ProjectDir)\..\cJSON;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\base;$(SolutionDir)\cJSON;$(IncludePath)</IncludePath>
     <LibraryPath>$(OutDir);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">