tools: move mkembedconfig into subdir

preparation for moving the conversion script into tools/

refs #4337

diff --git a/components/checker/Makefile.am b/components/checker/Makefile.am
index e8e15cbcb4822b8507c67400ab3d5bb196fb173b..347432d2069ca8547d08bcecd90c579b48e3a087 100644 (file)
--- a/components/checker/Makefile.am
+++ b/components/checker/Makefile.am
@@ -6,8 +6,8 @@ pkglib_LTLIBRARIES = \
 EXTRA_DIST = \
        checker-type.conf
 
-.conf.cpp: $(top_builddir)/tools/mkembedconfig.c
-       $(top_builddir)/tools/mkembedconfig $< $@
+.conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig.c
+       $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 libchecker_la_SOURCES = \
        checkercomponent.cpp \

diff --git a/components/checker/checker.vcxproj b/components/checker/checker.vcxproj
index a82056fb9836d28f56851799ddec65374a4626cc..8d8d6047fb61786ec11467cdadedcf4a5feb0ab1 100644 (file)
--- a/components/checker/checker.vcxproj
+++ b/components/checker/checker.vcxproj
@@ -181,10 +181,10 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).cpp;%(Outputs)</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/components/compat/Makefile.am b/components/compat/Makefile.am
index a974fae35247f61ce43493c6ca7483d095bf7d9c..41ecdd7fbe63199ac2b801b7607eadcf725fc2c4 100644 (file)
--- a/components/compat/Makefile.am
+++ b/components/compat/Makefile.am
@@ -6,8 +6,8 @@ pkglib_LTLIBRARIES = \
 EXTRA_DIST = \
        compat-type.conf
 
-.conf.cpp: $(top_builddir)/tools/mkembedconfig.c
-       $(top_builddir)/tools/mkembedconfig $< $@
+.conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig.c
+       $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 libcompat_la_SOURCES = \
        checkresultreader.cpp \

diff --git a/components/compat/compat.vcxproj b/components/compat/compat.vcxproj
index ccb339c42d51ac018e8a2641722e9aa95ba703ae..fbe716008cda42f57c0294c32392cdb7e5b28160 100644 (file)
--- a/components/compat/compat.vcxproj
+++ b/components/compat/compat.vcxproj
@@ -179,10 +179,10 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).cpp;%(Outputs)</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/components/delegation/Makefile.am b/components/delegation/Makefile.am
index 8711e3b1ef8fbda0644bd51a62e4752addc1dd33..ded393a4b6b24c74b4d021ef2050a9022eed9d82 100644 (file)
--- a/components/delegation/Makefile.am
+++ b/components/delegation/Makefile.am
@@ -6,8 +6,8 @@ pkglib_LTLIBRARIES = \
 EXTRA_DIST = \
        delegation-type.conf
 
-.conf.cpp: $(top_builddir)/tools/mkembedconfig.c
-       $(top_builddir)/tools/mkembedconfig $< $@
+.conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig.c
+       $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 libdelegation_la_SOURCES = \
        delegationcomponent.cpp \

diff --git a/components/delegation/delegation.vcxproj b/components/delegation/delegation.vcxproj
index 81bca438268dfd3035b41d7c4d780103a224cfb0..fcc240d84dce14461d19ad1c4290099fad993dcc 100644 (file)
--- a/components/delegation/delegation.vcxproj
+++ b/components/delegation/delegation.vcxproj
@@ -181,10 +181,10 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).cpp;%(Outputs)</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/components/demo/Makefile.am b/components/demo/Makefile.am
index a7a541d5229de2aa4f4d5687d700ea1afc31080a..0c887ce2d7123e86eafefbe0b4af0ea8d892d835 100644 (file)
--- a/components/demo/Makefile.am
+++ b/components/demo/Makefile.am
@@ -6,8 +6,8 @@ pkglib_LTLIBRARIES = \
 EXTRA_DIST = \
        demo-type.conf
 
-.conf.cpp: $(top_builddir)/tools/mkembedconfig.c
-       $(top_builddir)/tools/mkembedconfig $< $@
+.conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig.c
+       $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 libdemo_la_SOURCES = \
        democomponent.cpp \

diff --git a/components/demo/demo.vcxproj b/components/demo/demo.vcxproj
index cd6b6b88b468edc99163b152a81cdd00d7d05372..fcf55e5d2b5097ee2b70cf765854eb28bdeb3e48 100644 (file)
--- a/components/demo/demo.vcxproj
+++ b/components/demo/demo.vcxproj
@@ -181,10 +181,10 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).cpp;%(Outputs)</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/components/livestatus/Makefile.am b/components/livestatus/Makefile.am
index d5eb8b177f7d3fb6ffa756d38a135b964108792e..eb24855ffc77ed6c920b7a86ea9a22fd98e5db03 100644 (file)
--- a/components/livestatus/Makefile.am
+++ b/components/livestatus/Makefile.am
@@ -6,8 +6,8 @@ pkglib_LTLIBRARIES = \
 EXTRA_DIST = \
        livestatus-type.conf
 
-.conf.cpp: $(top_builddir)/tools/mkembedconfig.c
-       $(top_builddir)/tools/mkembedconfig $< $@
+.conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig.c
+       $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 liblivestatus_la_SOURCES = \
        attributefilter.cpp \

diff --git a/components/livestatus/livestatus.vcxproj b/components/livestatus/livestatus.vcxproj
index d63feeddf11c3b6699aa5aaf308ffd0121c84e97..fc8f678990851e620fe3278d5ea3f02a9b5a0ac5 100644 (file)
--- a/components/livestatus/livestatus.vcxproj
+++ b/components/livestatus/livestatus.vcxproj
@@ -73,10 +73,10 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).cpp;%(Outputs)</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
   <PropertyGroup Label="Globals">

diff --git a/components/notification/Makefile.am b/components/notification/Makefile.am
index ac96d3048ebae69a7fbc092824aa52f8de6e86cf..42117764ccf5c2b5fadf87334dfe75bc0d30dd41 100644 (file)
--- a/components/notification/Makefile.am
+++ b/components/notification/Makefile.am
@@ -6,8 +6,8 @@ pkglib_LTLIBRARIES = \
 EXTRA_DIST = \
        notification-type.conf
 
-.conf.cpp: $(top_builddir)/tools/mkembedconfig.c
-       $(top_builddir)/tools/mkembedconfig $< $@
+.conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig.c
+       $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 libnotification_la_SOURCES = \
        notificationcomponent.cpp \

diff --git a/components/notification/notification.vcxproj b/components/notification/notification.vcxproj
index 7075b968ed9440b80c0721ad081ae93120813678..8a33fb61b7169a0749252f95a7f4a7f030381f38 100644 (file)
--- a/components/notification/notification.vcxproj
+++ b/components/notification/notification.vcxproj
@@ -181,10 +181,10 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).cpp;%(Outputs)</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/components/replication/Makefile.am b/components/replication/Makefile.am
index d6cf716efc5a014489b257b2ba1e7992e5ff204d..29e81ae80aeeea76745b73d1d9fd74837022698d 100644 (file)
--- a/components/replication/Makefile.am
+++ b/components/replication/Makefile.am
@@ -6,8 +6,8 @@ pkglib_LTLIBRARIES = \
 EXTRA_DIST = \
        replication-type.conf
 
-.conf.cpp: $(top_builddir)/tools/mkembedconfig.c
-       $(top_builddir)/tools/mkembedconfig $< $@
+.conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig.c
+       $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 libreplication_la_SOURCES = \
        replicationcomponent.cpp \

diff --git a/components/replication/replication.vcxproj b/components/replication/replication.vcxproj
index c65de807c1ea8ea703edf82461cf827341a6bebe..5e3035b72ead284034e83ffad92acb386bbdba63 100644 (file)
--- a/components/replication/replication.vcxproj
+++ b/components/replication/replication.vcxproj
@@ -179,10 +179,10 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).cpp;%(Outputs)</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/configure.ac b/configure.ac
index 62054209e14f4dc4e8f08582852509320c69d810..e77e05527941dfec38d2d072e341058ba682ba73 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -144,6 +144,7 @@ third-party/cJSON/Makefile
 third-party/execvpe/Makefile
 third-party/mmatch/Makefile
 tools/Makefile
+tools/mkembedconfig/Makefile
 ])
 AC_OUTPUT([
 etc/init.d/icinga2

diff --git a/lib/config/Makefile.am b/lib/config/Makefile.am
index df64075e1b46cec058dbe7f90c79394fec477aca..62b071bdea66e76c13164f5ac5d13691a1c71f92 100644 (file)
--- a/lib/config/Makefile.am
+++ b/lib/config/Makefile.am
@@ -11,8 +11,8 @@ AM_YFLAGS = -d
 EXTRA_DIST = \
        base-type.conf
 
-.conf.cpp: $(top_builddir)/tools/mkembedconfig.c
-       $(top_builddir)/tools/mkembedconfig $< $@
+.conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig.c
+       $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 libconfig_la_SOURCES = \
        base-type.cpp \

diff --git a/lib/config/config.vcxproj b/lib/config/config.vcxproj
index ea405f584e1b7701041c873b606c3a47061f8f5b..3b2e46bfa12795a6f47365060718bab2c2488997 100644 (file)
--- a/lib/config/config.vcxproj
+++ b/lib/config/config.vcxproj
@@ -80,10 +80,10 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).cpp;%(Outputs)</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
     <None Include="config_lexer.ll">
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">config_lexer.cc</Outputs>

diff --git a/lib/icinga/Makefile.am b/lib/icinga/Makefile.am
index b2e46cb5ba19acfe2471fc5bc6a976ddd972c926..93d3b782b04567065369c61470189fb46cc199c5 100644 (file)
--- a/lib/icinga/Makefile.am
+++ b/lib/icinga/Makefile.am
@@ -7,8 +7,8 @@ pkglib_LTLIBRARIES =  \
 EXTRA_DIST = \
        icinga-type.conf
 
-.conf.cpp: $(top_builddir)/tools/mkembedconfig.c
-       $(top_builddir)/tools/mkembedconfig $< $@
+.conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig.c
+       $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 libicinga_la_SOURCES =  \
        api.cpp \

diff --git a/lib/icinga/icinga.vcxproj b/lib/icinga/icinga.vcxproj
index ec069a002bb74cb85a60fe6f5ac9c915d92b6f4f..160863db0901ae8c62ce11669c11c24e17e79b99 100644 (file)
--- a/lib/icinga/icinga.vcxproj
+++ b/lib/icinga/icinga.vcxproj
@@ -88,10 +88,10 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).cpp;%(Outputs)</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
   <PropertyGroup Label="Globals">

diff --git a/lib/remoting/Makefile.am b/lib/remoting/Makefile.am
index b3390c68aacdcbc7fb1d02b4b120d6e5189a2f7f..80a3dcf80471596966475aa581e09ea9e01dca12 100644 (file)
--- a/lib/remoting/Makefile.am
+++ b/lib/remoting/Makefile.am
@@ -4,8 +4,8 @@
 pkglib_LTLIBRARIES = \
        libremoting.la
 
-.conf.cpp: $(top_builddir)/tools/mkembedconfig.c
-       $(top_builddir)/tools/mkembedconfig $< $@
+.conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig.c
+       $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
 libremoting_la_SOURCES = \
        endpoint.cpp \

diff --git a/lib/remoting/remoting.vcxproj b/lib/remoting/remoting.vcxproj
index ab92ceca0509678f1a6cf36ec3a2b3bd47f1c785..f3dba42f3bc3ee69d9f07803fae0c72133cd3ee7 100644 (file)
--- a/lib/remoting/remoting.vcxproj
+++ b/lib/remoting/remoting.vcxproj
@@ -56,10 +56,10 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).cpp;%(Outputs)</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
   <PropertyGroup Label="Globals">

diff --git a/tools/Makefile.am b/tools/Makefile.am
index fa5024c73757754393ccd7d1f3bd4b091551ca1c..9f4d8e98012305dac5673967a858ee51ec3bdc7a 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,7 +1,3 @@
-## Process this file with automake to produce Makefile.in
 
-noinst_PROGRAMS = \
-       mkembedconfig
-
-mkembedconfig_SOURCES = \
-       mkembedconfig.c
+SUBDIRS = \
+                 mkembedconfig

diff --git a/tools/.gitignore b/tools/mkembedconfig/.gitignore
similarity index 100%
rename from tools/.gitignore
rename to tools/mkembedconfig/.gitignore

diff --git a/tools/mkembedconfig/Makefile.am b/tools/mkembedconfig/Makefile.am
new file mode 100644 (file)
index 0000000..fa5024c
--- /dev/null
+++ b/tools/mkembedconfig/Makefile.am
@@ -0,0 +1,7 @@
+## Process this file with automake to produce Makefile.in
+
+noinst_PROGRAMS = \
+       mkembedconfig
+
+mkembedconfig_SOURCES = \
+       mkembedconfig.c

diff --git a/tools/mkembedconfig.c b/tools/mkembedconfig/mkembedconfig.c
similarity index 100%
rename from tools/mkembedconfig.c
rename to tools/mkembedconfig/mkembedconfig.c

diff --git a/tools/mkembedconfig.vcxproj b/tools/mkembedconfig/mkembedconfig.vcxproj
similarity index 100%
rename from tools/mkembedconfig.vcxproj
rename to tools/mkembedconfig/mkembedconfig.vcxproj

diff --git a/tools/mkembedconfig.vcxproj.filters b/tools/mkembedconfig/mkembedconfig.vcxproj.filters
similarity index 100%
rename from tools/mkembedconfig.vcxproj.filters
rename to tools/mkembedconfig/mkembedconfig.vcxproj.filters