From 9b20a9271e1646594fa698af052a1857858a10c8 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Fri, 13 Apr 2012 13:16:54 +0200 Subject: [PATCH] Build fixes. --- Makefile.am | 3 +-- components/Makefile.am | 2 +- components/configfile/Makefile.am | 4 ++-- components/configfile/configfile.vcxproj | 4 ++-- components/configfile/configfilecomponent.cpp | 4 ++-- components/configrpc/configrpc.vcxproj | 4 ++-- components/configrpc/configrpccomponent.cpp | 2 +- configure.ac | 5 +++-- icinga-app/icinga-app.vcxproj | 4 ++-- icinga/icinga.vcxproj | 4 ++-- jsonrpc/jsonrpc.vcxproj | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Makefile.am b/Makefile.am index 71442f08e..ac6bea37f 100644 --- 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 846d3a48d..e32fb4b85 100644 --- 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 2fb90b239..75c2df6af 100644 --- 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 ea027953d..d21122a56 100644 --- a/components/configfile/configfile.vcxproj +++ b/components/configfile/configfile.vcxproj @@ -45,11 +45,11 @@ - $(ProjectDir)\..\base;$(ProjectDir)\..\cJSON;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\cJSON;$(IncludePath) $(OutDir);$(LibraryPath) - $(ProjectDir)\..\base;$(ProjectDir)\..\cJSON;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\cJSON;$(IncludePath) $(OutDir);$(LibraryPath) diff --git a/components/configfile/configfilecomponent.cpp b/components/configfile/configfilecomponent.cpp index 467ebee76..d0bf7d051 100644 --- a/components/configfile/configfilecomponent.cpp +++ b/components/configfile/configfilecomponent.cpp @@ -1,7 +1,7 @@ -#include "i2-configfilecomponent.h" -#include #include #include +#include "i2-configfile.h" +#include "cJSON.h" using namespace icinga; diff --git a/components/configrpc/configrpc.vcxproj b/components/configrpc/configrpc.vcxproj index 11c0c2779..ac93b490f 100644 --- a/components/configrpc/configrpc.vcxproj +++ b/components/configrpc/configrpc.vcxproj @@ -46,12 +46,12 @@ true - $(ProjectDir)\..\base;$(ProjectDir)\..\jsonrpc;$(ProjectDir)\..\icinga;$(ProjectDir)\..\cJSON;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cJSON;$(IncludePath) $(OutDir);$(LibraryPath) false - $(ProjectDir)\..\base;$(ProjectDir)\..\jsonrpc;$(ProjectDir)\..\icinga;$(ProjectDir)\..\cJSON;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cJSON;$(IncludePath) $(OutDir);$(LibraryPath) diff --git a/components/configrpc/configrpccomponent.cpp b/components/configrpc/configrpccomponent.cpp index 1c6803554..2f6d88282 100644 --- 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 c811fe7ae..70e549fa8 100644 --- 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 1091d7d86..077bd72ce 100644 --- a/icinga-app/icinga-app.vcxproj +++ b/icinga-app/icinga-app.vcxproj @@ -43,12 +43,12 @@ true - $(ProjectDir)\..\base;$(ProjectDir)\..\jsonrpc;$(ProjectDir)\..\cJSON;$(ProjectDir)\..\icinga;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\cJSON;$(SolutionDir)\icinga;$(IncludePath) $(OutDir);$(LibraryPath) false - $(ProjectDir)\..\base;$(ProjectDir)\..\jsonrpc;$(ProjectDir)\..\cJSON;$(ProjectDir)\..\icinga;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\cJSON;$(SolutionDir)\icinga;$(IncludePath) $(OutDir);$(LibraryPath) diff --git a/icinga/icinga.vcxproj b/icinga/icinga.vcxproj index 7f131b0ed..9457eed4e 100644 --- a/icinga/icinga.vcxproj +++ b/icinga/icinga.vcxproj @@ -55,12 +55,12 @@ true - $(ProjectDir)\..\base;$(ProjectDir)\..\jsonrpc;$(ProjectDir)\..\cJSON;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\cJSON;$(IncludePath) $(OutDir);$(LibraryPath) false - $(ProjectDir)\..\base;$(ProjectDir)\..\jsonrpc;$(ProjectDir)\..\cJSON;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\cJSON;$(IncludePath) $(OutDir);$(LibraryPath) diff --git a/jsonrpc/jsonrpc.vcxproj b/jsonrpc/jsonrpc.vcxproj index d009f244a..c1d632b75 100644 --- a/jsonrpc/jsonrpc.vcxproj +++ b/jsonrpc/jsonrpc.vcxproj @@ -51,11 +51,11 @@ - $(ProjectDir)\..\base;$(ProjectDir)\..\cJSON;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\cJSON;$(IncludePath) $(OutDir);$(LibraryPath) - $(ProjectDir)\..\base;$(ProjectDir)\..\cJSON;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\cJSON;$(IncludePath) $(OutDir);$(LibraryPath)