From c9fb309200fff7772bf126823f1620c4a19b4872 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Mon, 24 Jun 2013 15:57:11 +0200 Subject: [PATCH] tools: move mkembedconfig into subdir preparation for moving the conversion script into tools/ refs #4337 --- components/checker/Makefile.am | 4 ++-- components/checker/checker.vcxproj | 8 ++++---- components/compat/Makefile.am | 4 ++-- components/compat/compat.vcxproj | 8 ++++---- components/delegation/Makefile.am | 4 ++-- components/delegation/delegation.vcxproj | 8 ++++---- components/demo/Makefile.am | 4 ++-- components/demo/demo.vcxproj | 8 ++++---- components/livestatus/Makefile.am | 4 ++-- components/livestatus/livestatus.vcxproj | 8 ++++---- components/notification/Makefile.am | 4 ++-- components/notification/notification.vcxproj | 8 ++++---- components/replication/Makefile.am | 4 ++-- components/replication/replication.vcxproj | 8 ++++---- configure.ac | 1 + lib/config/Makefile.am | 4 ++-- lib/config/config.vcxproj | 8 ++++---- lib/icinga/Makefile.am | 4 ++-- lib/icinga/icinga.vcxproj | 8 ++++---- lib/remoting/Makefile.am | 4 ++-- lib/remoting/remoting.vcxproj | 8 ++++---- tools/Makefile.am | 8 ++------ tools/{ => mkembedconfig}/.gitignore | 0 tools/mkembedconfig/Makefile.am | 7 +++++++ tools/{ => mkembedconfig}/mkembedconfig.c | 0 tools/{ => mkembedconfig}/mkembedconfig.vcxproj | 0 tools/{ => mkembedconfig}/mkembedconfig.vcxproj.filters | 0 27 files changed, 70 insertions(+), 66 deletions(-) rename tools/{ => mkembedconfig}/.gitignore (100%) create mode 100644 tools/mkembedconfig/Makefile.am rename tools/{ => mkembedconfig}/mkembedconfig.c (100%) rename tools/{ => mkembedconfig}/mkembedconfig.vcxproj (100%) rename tools/{ => mkembedconfig}/mkembedconfig.vcxproj.filters (100%) diff --git a/components/checker/Makefile.am b/components/checker/Makefile.am index e8e15cbcb..347432d20 100644 --- 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 a82056fb9..8d8d6047f 100644 --- a/components/checker/checker.vcxproj +++ b/components/checker/checker.vcxproj @@ -181,10 +181,10 @@ %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c diff --git a/components/compat/Makefile.am b/components/compat/Makefile.am index a974fae35..41ecdd7fb 100644 --- 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 ccb339c42..fbe716008 100644 --- a/components/compat/compat.vcxproj +++ b/components/compat/compat.vcxproj @@ -179,10 +179,10 @@ %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c diff --git a/components/delegation/Makefile.am b/components/delegation/Makefile.am index 8711e3b1e..ded393a4b 100644 --- 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 81bca4382..fcc240d84 100644 --- a/components/delegation/delegation.vcxproj +++ b/components/delegation/delegation.vcxproj @@ -181,10 +181,10 @@ %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c diff --git a/components/demo/Makefile.am b/components/demo/Makefile.am index a7a541d52..0c887ce2d 100644 --- 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 cd6b6b88b..fcf55e5d2 100644 --- a/components/demo/demo.vcxproj +++ b/components/demo/demo.vcxproj @@ -181,10 +181,10 @@ %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c diff --git a/components/livestatus/Makefile.am b/components/livestatus/Makefile.am index d5eb8b177..eb24855ff 100644 --- 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 d63feeddf..fc8f67899 100644 --- a/components/livestatus/livestatus.vcxproj +++ b/components/livestatus/livestatus.vcxproj @@ -73,10 +73,10 @@ %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c diff --git a/components/notification/Makefile.am b/components/notification/Makefile.am index ac96d3048..42117764c 100644 --- 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 7075b968e..8a33fb61b 100644 --- a/components/notification/notification.vcxproj +++ b/components/notification/notification.vcxproj @@ -181,10 +181,10 @@ %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c diff --git a/components/replication/Makefile.am b/components/replication/Makefile.am index d6cf716ef..29e81ae80 100644 --- 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 c65de807c..5e3035b72 100644 --- a/components/replication/replication.vcxproj +++ b/components/replication/replication.vcxproj @@ -179,10 +179,10 @@ %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c diff --git a/configure.ac b/configure.ac index 62054209e..e77e05527 100644 --- 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 df64075e1..62b071bde 100644 --- 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 ea405f584..3b2e46bfa 100644 --- a/lib/config/config.vcxproj +++ b/lib/config/config.vcxproj @@ -80,10 +80,10 @@ %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c config_lexer.cc diff --git a/lib/icinga/Makefile.am b/lib/icinga/Makefile.am index b2e46cb5b..93d3b782b 100644 --- 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 ec069a002..160863db0 100644 --- a/lib/icinga/icinga.vcxproj +++ b/lib/icinga/icinga.vcxproj @@ -88,10 +88,10 @@ %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c diff --git a/lib/remoting/Makefile.am b/lib/remoting/Makefile.am index b3390c68a..80a3dcf80 100644 --- 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 ab92ceca0..f3dba42f3 100644 --- a/lib/remoting/remoting.vcxproj +++ b/lib/remoting/remoting.vcxproj @@ -56,10 +56,10 @@ %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) %(Filename).cpp;%(Outputs) - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c - $(SolutionDir)\tools\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c + $(SolutionDir)\tools\mkembedconfig\mkembedconfig.c diff --git a/tools/Makefile.am b/tools/Makefile.am index fa5024c73..9f4d8e980 100644 --- 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 index 000000000..fa5024c73 --- /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