From: Gunnar Beutner Date: Fri, 7 Sep 2012 08:27:31 +0000 (+0200) Subject: Renamed 'doc' to 'docs'. X-Git-Tag: v0.0.1~107 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9bc93ce4a9674700f34a0464957368d3f1b8b88d;p=icinga2 Renamed 'doc' to 'docs'. Moved Doxygen files to docs/. Removed cJSON directory. Moved libraries into lib/. Renamed 'config' to 'm4'. Renamed 'dyn' library to 'config'. --- diff --git a/.gitignore b/.gitignore index 7d360041e..a9fc51df6 100644 --- a/.gitignore +++ b/.gitignore @@ -42,5 +42,5 @@ debian/icinga2.postrm.debhelper debian/icinga2.substvars debian/icinga2 compat/include -doc +docs/dev Doxyfile diff --git a/Makefile.am b/Makefile.am index 4fec7325e..672c7d937 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,11 +5,7 @@ include aminclude.am SUBDIRS = \ third-party \ - base \ - dyn \ - jsonrpc \ - icinga \ - cib \ + lib \ components \ icinga-app \ test diff --git a/autogen.sh b/autogen.sh index df3d6718c..8f1354139 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,7 +1,7 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. -ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I config" +ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" srcdir=`dirname $0` test -z "$srcdir" && srcdir=. diff --git a/cJSON/cJSON.vcxproj.filters b/cJSON/cJSON.vcxproj.filters deleted file mode 100644 index 0296d380f..000000000 --- a/cJSON/cJSON.vcxproj.filters +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/components/checker/Makefile.am b/components/checker/Makefile.am index 798047c7f..62b001349 100644 --- a/components/checker/Makefile.am +++ b/components/checker/Makefile.am @@ -10,11 +10,11 @@ checker_la_SOURCES = \ checker_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/jsonrpc \ + -I${top_srcdir}/lib/icinga \ + -I${top_srcdir}/lib/cib checker_la_LDFLAGS = \ $(BOOST_LDFLAGS) \ @@ -26,8 +26,8 @@ checker_la_LDFLAGS = \ checker_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/jsonrpc/libjsonrpc.la \ + ${top_builddir}/lib/icinga/libicinga.la \ + ${top_builddir}/lib/cib/libcib.la diff --git a/components/checker/checker.vcxproj b/components/checker/checker.vcxproj index ad52932cf..f89baacb6 100644 --- a/components/checker/checker.vcxproj +++ b/components/checker/checker.vcxproj @@ -40,12 +40,12 @@ true $(OutDir);$(LibraryPath) - $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\config;$(IncludePath) false $(OutDir);$(LibraryPath) - $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\config;$(IncludePath) @@ -58,7 +58,7 @@ Windows true - base.lib;dyn.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies) + base.lib;config.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies) @@ -76,7 +76,7 @@ true true true - base.lib;dyn.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies) + base.lib;config.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies) @@ -89,4 +89,4 @@ - \ No newline at end of file + diff --git a/components/cibsync/Makefile.am b/components/cibsync/Makefile.am index c2fab7fa2..f5b5feecb 100644 --- a/components/cibsync/Makefile.am +++ b/components/cibsync/Makefile.am @@ -10,11 +10,11 @@ cibsync_la_SOURCES = \ cibsync_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/jsonrpc \ + -I${top_srcdir}/lib/icinga \ + -I${top_srcdir}/lib/cib cibsync_la_LDFLAGS = \ $(BOOST_LDFLAGS) \ @@ -26,8 +26,8 @@ cibsync_la_LDFLAGS = \ cibsync_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/jsonrpc/libjsonrpc.la \ + ${top_builddir}/lib/icinga/libicinga.la \ + ${top_builddir}/lib/cib/libcib.la diff --git a/components/cibsync/cibsync.vcxproj b/components/cibsync/cibsync.vcxproj index ea9623878..6d2af6bb0 100644 --- a/components/cibsync/cibsync.vcxproj +++ b/components/cibsync/cibsync.vcxproj @@ -39,12 +39,12 @@ true - $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\config;$(IncludePath) $(OutDir);$(LibraryPath) false - $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\dyn;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\jsonrpc;$(SolutionDir)\icinga;$(SolutionDir)\cib;$(SolutionDir)\config;$(IncludePath) $(OutDir);$(LibraryPath) @@ -57,7 +57,7 @@ Windows true - base.lib;dyn.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies) + base.lib;config.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies) @@ -74,7 +74,7 @@ true true true - base.lib;dyn.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies) + base.lib;config.lib;jsonrpc.lib;icinga.lib;cib.lib;%(AdditionalDependencies) @@ -87,4 +87,4 @@ - \ No newline at end of file + diff --git a/components/compat/Makefile.am b/components/compat/Makefile.am index 7d758ebd3..49de0d0f2 100644 --- a/components/compat/Makefile.am +++ b/components/compat/Makefile.am @@ -10,11 +10,11 @@ compat_la_SOURCES = \ compat_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/jsonrpc \ + -I${top_srcdir}/lib/icinga \ + -I${top_srcdir}/lib/cib compat_la_LDFLAGS = \ $(BOOST_LDFLAGS) \ @@ -26,8 +26,8 @@ compat_la_LDFLAGS = \ compat_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/jsonrpc/libjsonrpc.la \ + ${top_builddir}/lib/icinga/libicinga.la \ + ${top_builddir}/lib/cib/libcib.la diff --git a/components/convenience/Makefile.am b/components/convenience/Makefile.am index 919f6ab08..e615a641c 100644 --- a/components/convenience/Makefile.am +++ b/components/convenience/Makefile.am @@ -10,11 +10,11 @@ convenience_la_SOURCES = \ convenience_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/jsonrpc \ + -I${top_srcdir}/lib/icinga \ + -I${top_srcdir}/lib/cib convenience_la_LDFLAGS = \ $(BOOST_LDFLAGS) \ @@ -26,8 +26,8 @@ convenience_la_LDFLAGS = \ convenience_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/jsonrpc/libjsonrpc.la \ + ${top_builddir}/lib/icinga/libicinga.la \ + ${top_builddir}/lib/cib/libcib.la diff --git a/components/convenience/i2-convenience.h b/components/convenience/i2-convenience.h index f65ffdc4a..89930cfac 100644 --- a/components/convenience/i2-convenience.h +++ b/components/convenience/i2-convenience.h @@ -29,7 +29,7 @@ */ #include -#include +#include #include #include #include diff --git a/components/delegation/Makefile.am b/components/delegation/Makefile.am index 47c87284c..88fce279d 100644 --- a/components/delegation/Makefile.am +++ b/components/delegation/Makefile.am @@ -10,11 +10,11 @@ delegation_la_SOURCES = \ delegation_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/jsonrpc \ + -I${top_srcdir}/lib/icinga \ + -I${top_srcdir}/lib/cib delegation_la_LDFLAGS = \ $(BOOST_LDFLAGS) \ @@ -26,8 +26,8 @@ delegation_la_LDFLAGS = \ delegation_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/jsonrpc/libjsonrpc.la \ + ${top_builddir}/lib/icinga/libicinga.la \ + ${top_builddir}/lib/cib/libcib.la diff --git a/components/demo/Makefile.am b/components/demo/Makefile.am index 14e40db9b..e74d877b5 100644 --- a/components/demo/Makefile.am +++ b/components/demo/Makefile.am @@ -10,10 +10,10 @@ demo_la_SOURCES = \ demo_la_CPPFLAGS = \ $(BOOST_CPPFLAGS) \ - -I${top_srcdir}/base \ - -I${top_srcdir}/dyn \ - -I${top_srcdir}/jsonrpc \ - -I${top_srcdir}/icinga + -I${top_srcdir}/lib/base \ + -I${top_srcdir}/lib/config \ + -I${top_srcdir}/lib/jsonrpc \ + -I${top_srcdir}/lib/icinga demo_la_LDFLAGS = \ $(BOOST_LDFLAGS) \ @@ -25,7 +25,7 @@ demo_la_LDFLAGS = \ demo_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}/lib/base/libbase.la \ + ${top_builddir}/lib/config/libconfig.la \ + ${top_builddir}/lib/jsonrpc/libjsonrpc.la \ + ${top_builddir}/lib/icinga/libicinga.la diff --git a/configure.ac b/configure.ac index 859abae8f..796ec265f 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ AC_INIT AX_SPEC_FILE([icinga2.spec]) AX_SPEC_DEFAULTS AX_SET_VERSION_INFO -AC_CONFIG_AUX_DIR([config]) +AC_CONFIG_AUX_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE($PACKAGE,$VERSION) m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])]) @@ -44,7 +44,7 @@ DX_RTF_FEATURE(OFF) DX_XML_FEATURE(OFF) DX_PDF_FEATURE(OFF) DX_PS_FEATURE(OFF) -DX_INIT_DOXYGEN([icinga], [Doxyfile], [doc]) +DX_INIT_DOXYGEN([icinga], [docs/Doxyfile], [docs/dev]) AC_PROG_INSTALL AM_PROG_LEX @@ -67,8 +67,6 @@ AC_CHECK_LIB(shlwapi, PathRemoveFileSpecA) AC_CONFIG_FILES([ Makefile -base/Makefile -cib/Makefile components/Makefile components/checker/Makefile components/cibsync/Makefile @@ -76,16 +74,19 @@ components/compat/Makefile components/convenience/Makefile components/delegation/Makefile components/demo/Makefile -dyn/Makefile -icinga/Makefile +docs/Doxyfile icinga-app/Makefile -jsonrpc/Makefile +lib/Makefile +lib/base/Makefile +lib/cib/Makefile +lib/config/Makefile +lib/icinga/Makefile +lib/jsonrpc/Makefile test/Makefile third-party/Makefile third-party/cJSON/Makefile third-party/mmatch/Makefile third-party/popen-noshell/Makefile -Doxyfile ]) AC_OUTPUT diff --git a/Doxyfile.in b/docs/Doxyfile.in similarity index 100% rename from Doxyfile.in rename to docs/Doxyfile.in diff --git a/doc/icinga2-config.odt b/docs/icinga2-config.odt similarity index 100% rename from doc/icinga2-config.odt rename to docs/icinga2-config.odt diff --git a/doc/icinga2-config.txt b/docs/icinga2-config.txt similarity index 100% rename from doc/icinga2-config.txt rename to docs/icinga2-config.txt diff --git a/doc/icinga2-intro.txt b/docs/icinga2-intro.txt similarity index 100% rename from doc/icinga2-intro.txt rename to docs/icinga2-intro.txt diff --git a/icinga-app/Makefile.am b/icinga-app/Makefile.am index dbf9c06a4..b5b97faaf 100644 --- a/icinga-app/Makefile.am +++ b/icinga-app/Makefile.am @@ -11,10 +11,10 @@ icinga_CPPFLAGS = \ -DI2_ICINGALAUNCHER_BUILD \ $(LTDLINCL) \ $(BOOST_CPPFLAGS) \ - -I${top_srcdir}/base \ - -I${top_srcdir}/dyn \ - -I${top_srcdir}/jsonrpc \ - -I${top_srcdir}/icinga \ + -I${top_srcdir}/lib/base \ + -I${top_srcdir}/lib/config \ + -I${top_srcdir}/lib/jsonrpc \ + -I${top_srcdir}/lib/icinga \ -I${top_srcdir} icinga_LDFLAGS = \ @@ -25,9 +25,9 @@ icinga_LDADD = \ $(BOOST_SIGNALS_LIB) \ $(BOOST_THREAD_LIB) \ $(BOOST_SYSTEM_LIB) \ - ${top_builddir}/base/libbase.la \ - ${top_builddir}/dyn/libdyn.la \ - ${top_builddir}/icinga/libicinga.la \ + ${top_builddir}/lib/base/libbase.la \ + ${top_builddir}/lib/config/libconfig.la \ + ${top_builddir}/lib/icinga/libicinga.la \ -dlopen ${top_builddir}/components/checker/checker.la \ -dlopen ${top_builddir}/components/cibsync/cibsync.la \ -dlopen ${top_builddir}/components/compat/compat.la \ diff --git a/lib/Makefile.am b/lib/Makefile.am new file mode 100644 index 000000000..8901ea0a1 --- /dev/null +++ b/lib/Makefile.am @@ -0,0 +1,9 @@ +## Process this file with automake to produce Makefile.in +## Created by Anjuta + +SUBDIRS = \ + base \ + config \ + jsonrpc \ + icinga \ + cib diff --git a/base/Makefile.am b/lib/base/Makefile.am similarity index 100% rename from base/Makefile.am rename to lib/base/Makefile.am diff --git a/base/application.cpp b/lib/base/application.cpp similarity index 100% rename from base/application.cpp rename to lib/base/application.cpp diff --git a/base/application.h b/lib/base/application.h similarity index 100% rename from base/application.h rename to lib/base/application.h diff --git a/base/asynctask.h b/lib/base/asynctask.h similarity index 100% rename from base/asynctask.h rename to lib/base/asynctask.h diff --git a/base/base.vcxproj b/lib/base/base.vcxproj similarity index 100% rename from base/base.vcxproj rename to lib/base/base.vcxproj diff --git a/base/base.vcxproj.filters b/lib/base/base.vcxproj.filters similarity index 100% rename from base/base.vcxproj.filters rename to lib/base/base.vcxproj.filters diff --git a/base/component.cpp b/lib/base/component.cpp similarity index 100% rename from base/component.cpp rename to lib/base/component.cpp diff --git a/base/component.h b/lib/base/component.h similarity index 100% rename from base/component.h rename to lib/base/component.h diff --git a/base/dictionary.cpp b/lib/base/dictionary.cpp similarity index 100% rename from base/dictionary.cpp rename to lib/base/dictionary.cpp diff --git a/base/dictionary.h b/lib/base/dictionary.h similarity index 100% rename from base/dictionary.h rename to lib/base/dictionary.h diff --git a/base/dynamicobject.cpp b/lib/base/dynamicobject.cpp similarity index 100% rename from base/dynamicobject.cpp rename to lib/base/dynamicobject.cpp diff --git a/base/dynamicobject.h b/lib/base/dynamicobject.h similarity index 100% rename from base/dynamicobject.h rename to lib/base/dynamicobject.h diff --git a/base/event.cpp b/lib/base/event.cpp similarity index 100% rename from base/event.cpp rename to lib/base/event.cpp diff --git a/base/event.h b/lib/base/event.h similarity index 100% rename from base/event.h rename to lib/base/event.h diff --git a/base/exception.cpp b/lib/base/exception.cpp similarity index 100% rename from base/exception.cpp rename to lib/base/exception.cpp diff --git a/base/exception.h b/lib/base/exception.h similarity index 100% rename from base/exception.h rename to lib/base/exception.h diff --git a/base/fifo.cpp b/lib/base/fifo.cpp similarity index 100% rename from base/fifo.cpp rename to lib/base/fifo.cpp diff --git a/base/fifo.h b/lib/base/fifo.h similarity index 100% rename from base/fifo.h rename to lib/base/fifo.h diff --git a/base/i2-base.cpp b/lib/base/i2-base.cpp similarity index 100% rename from base/i2-base.cpp rename to lib/base/i2-base.cpp diff --git a/base/i2-base.h b/lib/base/i2-base.h similarity index 100% rename from base/i2-base.h rename to lib/base/i2-base.h diff --git a/base/ioqueue.h b/lib/base/ioqueue.h similarity index 100% rename from base/ioqueue.h rename to lib/base/ioqueue.h diff --git a/base/logger.cpp b/lib/base/logger.cpp similarity index 100% rename from base/logger.cpp rename to lib/base/logger.cpp diff --git a/base/logger.h b/lib/base/logger.h similarity index 100% rename from base/logger.h rename to lib/base/logger.h diff --git a/base/netstring.cpp b/lib/base/netstring.cpp similarity index 100% rename from base/netstring.cpp rename to lib/base/netstring.cpp diff --git a/base/netstring.h b/lib/base/netstring.h similarity index 100% rename from base/netstring.h rename to lib/base/netstring.h diff --git a/base/object.cpp b/lib/base/object.cpp similarity index 100% rename from base/object.cpp rename to lib/base/object.cpp diff --git a/base/object.h b/lib/base/object.h similarity index 100% rename from base/object.h rename to lib/base/object.h diff --git a/base/process.cpp b/lib/base/process.cpp similarity index 100% rename from base/process.cpp rename to lib/base/process.cpp diff --git a/base/process.h b/lib/base/process.h similarity index 100% rename from base/process.h rename to lib/base/process.h diff --git a/base/qstring.cpp b/lib/base/qstring.cpp similarity index 100% rename from base/qstring.cpp rename to lib/base/qstring.cpp diff --git a/base/qstring.h b/lib/base/qstring.h similarity index 100% rename from base/qstring.h rename to lib/base/qstring.h diff --git a/base/ringbuffer.cpp b/lib/base/ringbuffer.cpp similarity index 100% rename from base/ringbuffer.cpp rename to lib/base/ringbuffer.cpp diff --git a/base/ringbuffer.h b/lib/base/ringbuffer.h similarity index 100% rename from base/ringbuffer.h rename to lib/base/ringbuffer.h diff --git a/base/scriptfunction.cpp b/lib/base/scriptfunction.cpp similarity index 100% rename from base/scriptfunction.cpp rename to lib/base/scriptfunction.cpp diff --git a/base/scriptfunction.h b/lib/base/scriptfunction.h similarity index 100% rename from base/scriptfunction.h rename to lib/base/scriptfunction.h diff --git a/base/scripttask.cpp b/lib/base/scripttask.cpp similarity index 100% rename from base/scripttask.cpp rename to lib/base/scripttask.cpp diff --git a/base/scripttask.h b/lib/base/scripttask.h similarity index 100% rename from base/scripttask.h rename to lib/base/scripttask.h diff --git a/base/socket.cpp b/lib/base/socket.cpp similarity index 100% rename from base/socket.cpp rename to lib/base/socket.cpp diff --git a/base/socket.h b/lib/base/socket.h similarity index 100% rename from base/socket.h rename to lib/base/socket.h diff --git a/base/streamlogger.cpp b/lib/base/streamlogger.cpp similarity index 100% rename from base/streamlogger.cpp rename to lib/base/streamlogger.cpp diff --git a/base/streamlogger.h b/lib/base/streamlogger.h similarity index 100% rename from base/streamlogger.h rename to lib/base/streamlogger.h diff --git a/base/sysloglogger.cpp b/lib/base/sysloglogger.cpp similarity index 100% rename from base/sysloglogger.cpp rename to lib/base/sysloglogger.cpp diff --git a/base/sysloglogger.h b/lib/base/sysloglogger.h similarity index 100% rename from base/sysloglogger.h rename to lib/base/sysloglogger.h diff --git a/base/tcpclient.cpp b/lib/base/tcpclient.cpp similarity index 100% rename from base/tcpclient.cpp rename to lib/base/tcpclient.cpp diff --git a/base/tcpclient.h b/lib/base/tcpclient.h similarity index 100% rename from base/tcpclient.h rename to lib/base/tcpclient.h diff --git a/base/tcpserver.cpp b/lib/base/tcpserver.cpp similarity index 100% rename from base/tcpserver.cpp rename to lib/base/tcpserver.cpp diff --git a/base/tcpserver.h b/lib/base/tcpserver.h similarity index 100% rename from base/tcpserver.h rename to lib/base/tcpserver.h diff --git a/base/tcpsocket.cpp b/lib/base/tcpsocket.cpp similarity index 100% rename from base/tcpsocket.cpp rename to lib/base/tcpsocket.cpp diff --git a/base/tcpsocket.h b/lib/base/tcpsocket.h similarity index 100% rename from base/tcpsocket.h rename to lib/base/tcpsocket.h diff --git a/base/threadpool.cpp b/lib/base/threadpool.cpp similarity index 100% rename from base/threadpool.cpp rename to lib/base/threadpool.cpp diff --git a/base/threadpool.h b/lib/base/threadpool.h similarity index 100% rename from base/threadpool.h rename to lib/base/threadpool.h diff --git a/base/timer.cpp b/lib/base/timer.cpp similarity index 100% rename from base/timer.cpp rename to lib/base/timer.cpp diff --git a/base/timer.h b/lib/base/timer.h similarity index 100% rename from base/timer.h rename to lib/base/timer.h diff --git a/base/tlsclient.cpp b/lib/base/tlsclient.cpp similarity index 100% rename from base/tlsclient.cpp rename to lib/base/tlsclient.cpp diff --git a/base/tlsclient.h b/lib/base/tlsclient.h similarity index 100% rename from base/tlsclient.h rename to lib/base/tlsclient.h diff --git a/base/unix.cpp b/lib/base/unix.cpp similarity index 100% rename from base/unix.cpp rename to lib/base/unix.cpp diff --git a/base/unix.h b/lib/base/unix.h similarity index 100% rename from base/unix.h rename to lib/base/unix.h diff --git a/base/utility.cpp b/lib/base/utility.cpp similarity index 100% rename from base/utility.cpp rename to lib/base/utility.cpp diff --git a/base/utility.h b/lib/base/utility.h similarity index 100% rename from base/utility.h rename to lib/base/utility.h diff --git a/base/value.cpp b/lib/base/value.cpp similarity index 100% rename from base/value.cpp rename to lib/base/value.cpp diff --git a/base/value.h b/lib/base/value.h similarity index 100% rename from base/value.h rename to lib/base/value.h diff --git a/base/win32.cpp b/lib/base/win32.cpp similarity index 100% rename from base/win32.cpp rename to lib/base/win32.cpp diff --git a/base/win32.h b/lib/base/win32.h similarity index 100% rename from base/win32.h rename to lib/base/win32.h diff --git a/cib/Makefile.am b/lib/cib/Makefile.am similarity index 70% rename from cib/Makefile.am rename to lib/cib/Makefile.am index 98cfdf6bf..d8c7bd124 100644 --- a/cib/Makefile.am +++ b/lib/cib/Makefile.am @@ -27,10 +27,10 @@ libcib_la_SOURCES = \ libcib_la_CPPFLAGS = \ -DI2_CIB_BUILD \ $(BOOST_CPPFLAGS) \ - -I${top_srcdir}/base \ - -I${top_srcdir}/dyn \ - -I${top_srcdir}/jsonrpc \ - -I${top_srcdir}/icinga + -I${top_srcdir}/lib/base \ + -I${top_srcdir}/lib/config \ + -I${top_srcdir}/lib/jsonrpc \ + -I${top_srcdir}/lib/icinga libcib_la_LDFLAGS = \ $(BOOST_LDFLAGS) \ @@ -41,7 +41,7 @@ libcib_la_LDFLAGS = \ libcib_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}/lib/base/libbase.la \ + ${top_builddir}/lib/config/libconfig.la \ + ${top_builddir}/lib/jsonrpc/libjsonrpc.la \ + ${top_builddir}/lib/icinga/libicinga.la diff --git a/cib/cib.cpp b/lib/cib/cib.cpp similarity index 100% rename from cib/cib.cpp rename to lib/cib/cib.cpp diff --git a/cib/cib.h b/lib/cib/cib.h similarity index 100% rename from cib/cib.h rename to lib/cib/cib.h diff --git a/cib/cib.vcxproj b/lib/cib/cib.vcxproj similarity index 93% rename from cib/cib.vcxproj rename to lib/cib/cib.vcxproj index 4980e5862..067749d10 100644 --- a/cib/cib.vcxproj +++ b/lib/cib/cib.vcxproj @@ -39,12 +39,12 @@ true - $(SolutionDir)\base;$(SolutionDir)\icinga;$(SolutionDir)\jsonrpc;$(SolutionDir)\dyn;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\icinga;$(SolutionDir)\jsonrpc;$(SolutionDir)\config;$(IncludePath) $(OutDir);$(LibraryPath) false - $(SolutionDir)\base;$(SolutionDir)\icinga;$(SolutionDir)\jsonrpc;$(SolutionDir)\dyn;$(IncludePath) + $(SolutionDir)\base;$(SolutionDir)\icinga;$(SolutionDir)\jsonrpc;$(SolutionDir)\config;$(IncludePath) $(OutDir);$(LibraryPath) @@ -59,7 +59,7 @@ Windows true - base.lib;icinga.lib;jsonrpc.lib;dyn.lib;%(AdditionalDependencies) + base.lib;icinga.lib;jsonrpc.lib;config.lib;%(AdditionalDependencies) @@ -78,7 +78,7 @@ true true true - base.lib;icinga.lib;jsonrpc.lib;dyn.lib;%(AdditionalDependencies) + base.lib;icinga.lib;jsonrpc.lib;config.lib;%(AdditionalDependencies) @@ -111,4 +111,4 @@ - \ No newline at end of file + diff --git a/cib/cib.vcxproj.filters b/lib/cib/cib.vcxproj.filters similarity index 100% rename from cib/cib.vcxproj.filters rename to lib/cib/cib.vcxproj.filters diff --git a/cib/host.cpp b/lib/cib/host.cpp similarity index 100% rename from cib/host.cpp rename to lib/cib/host.cpp diff --git a/cib/host.h b/lib/cib/host.h similarity index 100% rename from cib/host.h rename to lib/cib/host.h diff --git a/cib/hostgroup.cpp b/lib/cib/hostgroup.cpp similarity index 100% rename from cib/hostgroup.cpp rename to lib/cib/hostgroup.cpp diff --git a/cib/hostgroup.h b/lib/cib/hostgroup.h similarity index 100% rename from cib/hostgroup.h rename to lib/cib/hostgroup.h diff --git a/cib/i2-cib.cpp b/lib/cib/i2-cib.cpp similarity index 100% rename from cib/i2-cib.cpp rename to lib/cib/i2-cib.cpp diff --git a/cib/i2-cib.h b/lib/cib/i2-cib.h similarity index 98% rename from cib/i2-cib.h rename to lib/cib/i2-cib.h index 9863164d4..0a6bf939a 100644 --- a/cib/i2-cib.h +++ b/lib/cib/i2-cib.h @@ -27,7 +27,7 @@ * updates from all the other Icinga components. */ -#include +#include #include #ifdef I2_CIB_BUILD diff --git a/cib/macroprocessor.cpp b/lib/cib/macroprocessor.cpp similarity index 100% rename from cib/macroprocessor.cpp rename to lib/cib/macroprocessor.cpp diff --git a/cib/macroprocessor.h b/lib/cib/macroprocessor.h similarity index 100% rename from cib/macroprocessor.h rename to lib/cib/macroprocessor.h diff --git a/cib/nagioschecktask.cpp b/lib/cib/nagioschecktask.cpp similarity index 100% rename from cib/nagioschecktask.cpp rename to lib/cib/nagioschecktask.cpp diff --git a/cib/nagioschecktask.h b/lib/cib/nagioschecktask.h similarity index 100% rename from cib/nagioschecktask.h rename to lib/cib/nagioschecktask.h diff --git a/cib/nullchecktask.cpp b/lib/cib/nullchecktask.cpp similarity index 100% rename from cib/nullchecktask.cpp rename to lib/cib/nullchecktask.cpp diff --git a/cib/nullchecktask.h b/lib/cib/nullchecktask.h similarity index 100% rename from cib/nullchecktask.h rename to lib/cib/nullchecktask.h diff --git a/cib/service.cpp b/lib/cib/service.cpp similarity index 100% rename from cib/service.cpp rename to lib/cib/service.cpp diff --git a/cib/service.h b/lib/cib/service.h similarity index 100% rename from cib/service.h rename to lib/cib/service.h diff --git a/cib/servicegroup.cpp b/lib/cib/servicegroup.cpp similarity index 100% rename from cib/servicegroup.cpp rename to lib/cib/servicegroup.cpp diff --git a/cib/servicegroup.h b/lib/cib/servicegroup.h similarity index 100% rename from cib/servicegroup.h rename to lib/cib/servicegroup.h diff --git a/cib/servicestatechangemessage.cpp b/lib/cib/servicestatechangemessage.cpp similarity index 100% rename from cib/servicestatechangemessage.cpp rename to lib/cib/servicestatechangemessage.cpp diff --git a/cib/servicestatechangemessage.h b/lib/cib/servicestatechangemessage.h similarity index 100% rename from cib/servicestatechangemessage.h rename to lib/cib/servicestatechangemessage.h diff --git a/dyn/Makefile.am b/lib/config/Makefile.am similarity index 69% rename from dyn/Makefile.am rename to lib/config/Makefile.am index 4a6377b79..606208b26 100644 --- a/dyn/Makefile.am +++ b/lib/config/Makefile.am @@ -2,18 +2,18 @@ pkglib_LTLIBRARIES = \ - libdyn.la + libconfig.la BUILT_SOURCES = config_parser.h AM_YFLAGS = -d -libdyn_la_SOURCES = \ +libconfig_la_SOURCES = \ configcompiler.cpp \ configcompiler.h \ config_lexer.ll \ config_parser.yy \ - i2-dyn.h \ + i2-config.h \ configitem.cpp \ configitem.h \ configitembuilder.cpp \ @@ -24,16 +24,16 @@ libdyn_la_SOURCES = \ expressionlist.cpp \ expressionlist.h -libdyn_la_CPPFLAGS = \ - -DI2_DYN_BUILD \ +libconfig_la_CPPFLAGS = \ + -DI2_CONFIG_BUILD \ $(BOOST_CPPFLAGS) \ - -I${top_srcdir}/base + -I${top_srcdir}/lib/base -libdyn_la_LDFLAGS = \ +libconfig_la_LDFLAGS = \ $(BOOST_LDFLAGS) \ -no-undefined \ @RELEASE_INFO@ \ @VERSION_INFO@ -libdyn_la_LIBADD = \ - ${top_builddir}/base/libbase.la +libconfig_la_LIBADD = \ + ${top_builddir}/lib/base/libbase.la diff --git a/dyn/dyn.vcxproj b/lib/config/config.vcxproj similarity index 93% rename from dyn/dyn.vcxproj rename to lib/config/config.vcxproj index 07b7a0afe..1158765e9 100644 --- a/dyn/dyn.vcxproj +++ b/lib/config/config.vcxproj @@ -18,7 +18,7 @@ - + @@ -34,7 +34,7 @@ - + Create Create @@ -58,7 +58,7 @@ {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} Win32Proj - dyn + config @@ -95,9 +95,9 @@ Use Level3 Disabled - _WINDLL;I2_DYN_BUILD;_DEBUG;%(PreprocessorDefinitions) + _WINDLL;I2_CONFIG_BUILD;_DEBUG;%(PreprocessorDefinitions) false - i2-dyn.h + i2-config.h true @@ -113,9 +113,9 @@ MaxSpeed true true - _WINDLL;I2_DYN_BUILD;%(PreprocessorDefinitions) + _WINDLL;I2_CONFIG_BUILD;%(PreprocessorDefinitions) false - i2-dyn.h + i2-config.h true @@ -129,4 +129,4 @@ - \ No newline at end of file + diff --git a/dyn/dyn.vcxproj.filters b/lib/config/config.vcxproj.filters similarity index 95% rename from dyn/dyn.vcxproj.filters rename to lib/config/config.vcxproj.filters index a73d7f2a3..7467c63cc 100644 --- a/dyn/dyn.vcxproj.filters +++ b/lib/config/config.vcxproj.filters @@ -22,7 +22,7 @@ Quelldateien - + Quelldateien @@ -30,7 +30,7 @@ Headerdateien - + Headerdateien @@ -68,4 +68,4 @@ {0504454a-6829-427c-b1d7-cbca722af0d9} - \ No newline at end of file + diff --git a/dyn/config_lexer.cc b/lib/config/config_lexer.cc similarity index 99% rename from dyn/config_lexer.cc rename to lib/config/config_lexer.cc index fd7bc4484..d399ba184 100644 --- a/dyn/config_lexer.cc +++ b/lib/config/config_lexer.cc @@ -524,7 +524,7 @@ static yyconst flex_int32_t yy_rule_can_match_eol[23] = * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "i2-dyn.h" +#include "i2-config.h" #include "config_parser.h" using namespace icinga; diff --git a/dyn/config_lexer.ll b/lib/config/config_lexer.ll similarity index 99% rename from dyn/config_lexer.ll rename to lib/config/config_lexer.ll index 66e1c5633..95cdb9ec4 100644 --- a/dyn/config_lexer.ll +++ b/lib/config/config_lexer.ll @@ -18,7 +18,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "i2-dyn.h" +#include "i2-config.h" #include "config_parser.h" using namespace icinga; diff --git a/dyn/config_parser.cc b/lib/config/config_parser.cc similarity index 99% rename from dyn/config_parser.cc rename to lib/config/config_parser.cc index a5550ba89..508c8052b 100644 --- a/dyn/config_parser.cc +++ b/lib/config/config_parser.cc @@ -111,7 +111,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "i2-dyn.h" +#include "i2-config.h" using namespace icinga; diff --git a/dyn/config_parser.h b/lib/config/config_parser.h similarity index 99% rename from dyn/config_parser.h rename to lib/config/config_parser.h index 31820abe6..b9bacc4be 100644 --- a/dyn/config_parser.h +++ b/lib/config/config_parser.h @@ -54,7 +54,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "i2-dyn.h" +#include "i2-config.h" using namespace icinga; diff --git a/dyn/config_parser.yy b/lib/config/config_parser.yy similarity index 99% rename from dyn/config_parser.yy rename to lib/config/config_parser.yy index fc639bef5..8c4b49548 100644 --- a/dyn/config_parser.yy +++ b/lib/config/config_parser.yy @@ -18,7 +18,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "i2-dyn.h" +#include "i2-config.h" using namespace icinga; diff --git a/dyn/configcompiler.cpp b/lib/config/configcompiler.cpp similarity index 97% rename from dyn/configcompiler.cpp rename to lib/config/configcompiler.cpp index b781b850f..bf80ce0be 100644 --- a/dyn/configcompiler.cpp +++ b/lib/config/configcompiler.cpp @@ -17,7 +17,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "i2-dyn.h" +#include "i2-config.h" using std::ifstream; @@ -77,7 +77,7 @@ vector ConfigCompiler::CompileFile(const String& path) if (!stream) throw_exception(invalid_argument("Could not open config file: " + path)); - Logger::Write(LogInformation, "dyn", "Compiling config file: " + path); + Logger::Write(LogInformation, "config", "Compiling config file: " + path); return CompileStream(path, &stream); } diff --git a/dyn/configcompiler.h b/lib/config/configcompiler.h similarity index 98% rename from dyn/configcompiler.h rename to lib/config/configcompiler.h index b2c7e9fa8..782597a33 100644 --- a/dyn/configcompiler.h +++ b/lib/config/configcompiler.h @@ -23,7 +23,7 @@ namespace icinga { -class I2_DYN_API ConfigCompiler +class I2_CONFIG_API ConfigCompiler { public: typedef function (const String& include)> HandleIncludeFunc; diff --git a/dyn/configitem.cpp b/lib/config/configitem.cpp similarity index 99% rename from dyn/configitem.cpp rename to lib/config/configitem.cpp index c2f00c7e5..ff57bf966 100644 --- a/dyn/configitem.cpp +++ b/lib/config/configitem.cpp @@ -17,7 +17,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "i2-dyn.h" +#include "i2-config.h" using namespace icinga; diff --git a/dyn/configitem.h b/lib/config/configitem.h similarity index 98% rename from dyn/configitem.h rename to lib/config/configitem.h index 260232d2f..699d379ee 100644 --- a/dyn/configitem.h +++ b/lib/config/configitem.h @@ -23,7 +23,7 @@ namespace icinga { -class I2_DYN_API ConfigItem : public Object { +class I2_CONFIG_API ConfigItem : public Object { public: typedef shared_ptr Ptr; typedef weak_ptr WeakPtr; diff --git a/dyn/configitembuilder.cpp b/lib/config/configitembuilder.cpp similarity index 99% rename from dyn/configitembuilder.cpp rename to lib/config/configitembuilder.cpp index 4894ab48e..36e3671b0 100644 --- a/dyn/configitembuilder.cpp +++ b/lib/config/configitembuilder.cpp @@ -17,7 +17,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "i2-dyn.h" +#include "i2-config.h" using namespace icinga; diff --git a/dyn/configitembuilder.h b/lib/config/configitembuilder.h similarity index 97% rename from dyn/configitembuilder.h rename to lib/config/configitembuilder.h index 0d3ed6630..b1e46045c 100644 --- a/dyn/configitembuilder.h +++ b/lib/config/configitembuilder.h @@ -23,7 +23,7 @@ namespace icinga { -class I2_DYN_API ConfigItemBuilder : public Object +class I2_CONFIG_API ConfigItemBuilder : public Object { public: typedef shared_ptr Ptr; diff --git a/dyn/debuginfo.h b/lib/config/debuginfo.h similarity index 100% rename from dyn/debuginfo.h rename to lib/config/debuginfo.h diff --git a/dyn/expression.cpp b/lib/config/expression.cpp similarity index 99% rename from dyn/expression.cpp rename to lib/config/expression.cpp index 1aa842789..66b37e2ab 100644 --- a/dyn/expression.cpp +++ b/lib/config/expression.cpp @@ -17,7 +17,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "i2-dyn.h" +#include "i2-config.h" using namespace icinga; diff --git a/dyn/expression.h b/lib/config/expression.h similarity index 98% rename from dyn/expression.h rename to lib/config/expression.h index 5cf82e5f4..b239b7b53 100644 --- a/dyn/expression.h +++ b/lib/config/expression.h @@ -33,7 +33,7 @@ enum ExpressionOperator OperatorDivide }; -struct I2_DYN_API Expression +struct I2_CONFIG_API Expression { public: Expression(const String& key, ExpressionOperator op, const Value& value, const DebugInfo& debuginfo); diff --git a/dyn/expressionlist.cpp b/lib/config/expressionlist.cpp similarity index 98% rename from dyn/expressionlist.cpp rename to lib/config/expressionlist.cpp index 41cf019ea..a22be1d61 100644 --- a/dyn/expressionlist.cpp +++ b/lib/config/expressionlist.cpp @@ -17,7 +17,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#include "i2-dyn.h" +#include "i2-config.h" using namespace icinga; diff --git a/dyn/expressionlist.h b/lib/config/expressionlist.h similarity index 97% rename from dyn/expressionlist.h rename to lib/config/expressionlist.h index d0364e550..9869b60bf 100644 --- a/dyn/expressionlist.h +++ b/lib/config/expressionlist.h @@ -23,7 +23,7 @@ namespace icinga { -class I2_DYN_API ExpressionList : public Object +class I2_CONFIG_API ExpressionList : public Object { public: typedef shared_ptr Ptr; diff --git a/dyn/i2-dyn.cpp b/lib/config/i2-config.cpp similarity index 98% rename from dyn/i2-dyn.cpp rename to lib/config/i2-config.cpp index 4dc432ca6..6f83e0a07 100644 --- a/dyn/i2-dyn.cpp +++ b/lib/config/i2-config.cpp @@ -19,4 +19,4 @@ /* This file is used by MSVC to generate the pre-compiled hedader. */ -#include "i2-dyn.h" +#include "i2-config.h" diff --git a/dyn/i2-dyn.h b/lib/config/i2-config.h similarity index 88% rename from dyn/i2-dyn.h rename to lib/config/i2-config.h index b504ff841..ce4cd4e69 100644 --- a/dyn/i2-dyn.h +++ b/lib/config/i2-config.h @@ -17,11 +17,11 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#ifndef I2DYN_H -#define I2DYN_H +#ifndef I2CONFIG_H +#define I2CONFIG_H /** - * @defgroup dyn Dynamic object library + * @defgroup config Dynamic object library * * The dynamic object library implements serializable objects which support * inheritance. @@ -38,11 +38,11 @@ using std::ostream; using std::cin; using std::endl; -#ifdef I2_DYN_BUILD -# define I2_DYN_API I2_EXPORT -#else /* I2_DYN_BUILD */ -# define I2_DYN_API I2_IMPORT -#endif /* I2_DYN_BUILD */ +#ifdef I2_CONFIG_BUILD +# define I2_CONFIG_API I2_EXPORT +#else /* I2_CONFIG_BUILD */ +# define I2_CONFIG_API I2_IMPORT +#endif /* I2_CONFIG_BUILD */ #include "debuginfo.h" #include "expression.h" @@ -51,4 +51,4 @@ using std::endl; #include "configitembuilder.h" #include "configcompiler.h" -#endif /* I2DYN_H */ +#endif /* I2CONFIG_H */ diff --git a/icinga/Makefile.am b/lib/icinga/Makefile.am similarity index 69% rename from icinga/Makefile.am rename to lib/icinga/Makefile.am index 91952ff2f..eee31a2ea 100644 --- a/icinga/Makefile.am +++ b/lib/icinga/Makefile.am @@ -16,10 +16,9 @@ libicinga_la_SOURCES = \ libicinga_la_CPPFLAGS = \ -DI2_ICINGA_BUILD \ $(BOOST_CPPFLAGS) \ - -I${top_srcdir}/base \ - -I${top_srcdir}/dyn \ - -I${top_srcdir}/jsonrpc \ - -I${top_srcdir}/cJSON \ + -I${top_srcdir}/lib/base \ + -I${top_srcdir}/lib/config \ + -I${top_srcdir}/lib/jsonrpc \ -I${top_srcdir} libicinga_la_LDFLAGS = \ @@ -30,6 +29,6 @@ libicinga_la_LDFLAGS = \ libicinga_la_LIBADD = \ $(BOOST_THREAD_LIB) \ - ${top_builddir}/base/libbase.la \ - ${top_builddir}/dyn/libdyn.la \ - ${top_builddir}/jsonrpc/libjsonrpc.la + ${top_builddir}/lib/base/libbase.la \ + ${top_builddir}/lib/config/libconfig.la \ + ${top_builddir}/lib/jsonrpc/libjsonrpc.la diff --git a/icinga/endpoint.cpp b/lib/icinga/endpoint.cpp similarity index 100% rename from icinga/endpoint.cpp rename to lib/icinga/endpoint.cpp diff --git a/icinga/endpoint.h b/lib/icinga/endpoint.h similarity index 100% rename from icinga/endpoint.h rename to lib/icinga/endpoint.h diff --git a/icinga/endpointmanager.cpp b/lib/icinga/endpointmanager.cpp similarity index 100% rename from icinga/endpointmanager.cpp rename to lib/icinga/endpointmanager.cpp diff --git a/icinga/endpointmanager.h b/lib/icinga/endpointmanager.h similarity index 100% rename from icinga/endpointmanager.h rename to lib/icinga/endpointmanager.h diff --git a/icinga/i2-icinga.cpp b/lib/icinga/i2-icinga.cpp similarity index 100% rename from icinga/i2-icinga.cpp rename to lib/icinga/i2-icinga.cpp diff --git a/icinga/i2-icinga.h b/lib/icinga/i2-icinga.h similarity index 98% rename from icinga/i2-icinga.h rename to lib/icinga/i2-icinga.h index 85637333a..1b2a0856d 100644 --- a/icinga/i2-icinga.h +++ b/lib/icinga/i2-icinga.h @@ -28,7 +28,7 @@ */ #include -#include +#include #include #include diff --git a/icinga/icinga.vcxproj b/lib/icinga/icinga.vcxproj similarity index 100% rename from icinga/icinga.vcxproj rename to lib/icinga/icinga.vcxproj diff --git a/icinga/icinga.vcxproj.filters b/lib/icinga/icinga.vcxproj.filters similarity index 100% rename from icinga/icinga.vcxproj.filters rename to lib/icinga/icinga.vcxproj.filters diff --git a/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp similarity index 100% rename from icinga/icingaapplication.cpp rename to lib/icinga/icingaapplication.cpp diff --git a/icinga/icingaapplication.h b/lib/icinga/icingaapplication.h similarity index 100% rename from icinga/icingaapplication.h rename to lib/icinga/icingaapplication.h diff --git a/jsonrpc/Makefile.am b/lib/jsonrpc/Makefile.am similarity index 89% rename from jsonrpc/Makefile.am rename to lib/jsonrpc/Makefile.am index 85fcccc4f..6450c5d1d 100644 --- a/jsonrpc/Makefile.am +++ b/lib/jsonrpc/Makefile.am @@ -20,7 +20,7 @@ libjsonrpc_la_SOURCES = \ libjsonrpc_la_CPPFLAGS = \ -DI2_JSONRPC_BUILD \ $(BOOST_CPPFLAGS) \ - -I${top_srcdir}/base + -I${top_srcdir}/lib/base libjsonrpc_la_LDFLAGS = \ $(BOOST_LDFLAGS) \ @@ -29,4 +29,4 @@ libjsonrpc_la_LDFLAGS = \ @VERSION_INFO@ libjsonrpc_la_LIBADD = \ - ${top_builddir}/base/libbase.la + ${top_builddir}/lib/base/libbase.la diff --git a/jsonrpc/i2-jsonrpc.cpp b/lib/jsonrpc/i2-jsonrpc.cpp similarity index 100% rename from jsonrpc/i2-jsonrpc.cpp rename to lib/jsonrpc/i2-jsonrpc.cpp diff --git a/jsonrpc/i2-jsonrpc.h b/lib/jsonrpc/i2-jsonrpc.h similarity index 100% rename from jsonrpc/i2-jsonrpc.h rename to lib/jsonrpc/i2-jsonrpc.h diff --git a/jsonrpc/jsonrpc.vcxproj b/lib/jsonrpc/jsonrpc.vcxproj similarity index 100% rename from jsonrpc/jsonrpc.vcxproj rename to lib/jsonrpc/jsonrpc.vcxproj diff --git a/jsonrpc/jsonrpc.vcxproj.filters b/lib/jsonrpc/jsonrpc.vcxproj.filters similarity index 100% rename from jsonrpc/jsonrpc.vcxproj.filters rename to lib/jsonrpc/jsonrpc.vcxproj.filters diff --git a/jsonrpc/jsonrpcclient.cpp b/lib/jsonrpc/jsonrpcclient.cpp similarity index 100% rename from jsonrpc/jsonrpcclient.cpp rename to lib/jsonrpc/jsonrpcclient.cpp diff --git a/jsonrpc/jsonrpcclient.h b/lib/jsonrpc/jsonrpcclient.h similarity index 100% rename from jsonrpc/jsonrpcclient.h rename to lib/jsonrpc/jsonrpcclient.h diff --git a/jsonrpc/jsonrpcserver.cpp b/lib/jsonrpc/jsonrpcserver.cpp similarity index 100% rename from jsonrpc/jsonrpcserver.cpp rename to lib/jsonrpc/jsonrpcserver.cpp diff --git a/jsonrpc/jsonrpcserver.h b/lib/jsonrpc/jsonrpcserver.h similarity index 100% rename from jsonrpc/jsonrpcserver.h rename to lib/jsonrpc/jsonrpcserver.h diff --git a/jsonrpc/messagepart.cpp b/lib/jsonrpc/messagepart.cpp similarity index 100% rename from jsonrpc/messagepart.cpp rename to lib/jsonrpc/messagepart.cpp diff --git a/jsonrpc/messagepart.h b/lib/jsonrpc/messagepart.h similarity index 100% rename from jsonrpc/messagepart.h rename to lib/jsonrpc/messagepart.h diff --git a/jsonrpc/requestmessage.cpp b/lib/jsonrpc/requestmessage.cpp similarity index 100% rename from jsonrpc/requestmessage.cpp rename to lib/jsonrpc/requestmessage.cpp diff --git a/jsonrpc/requestmessage.h b/lib/jsonrpc/requestmessage.h similarity index 100% rename from jsonrpc/requestmessage.h rename to lib/jsonrpc/requestmessage.h diff --git a/jsonrpc/responsemessage.cpp b/lib/jsonrpc/responsemessage.cpp similarity index 100% rename from jsonrpc/responsemessage.cpp rename to lib/jsonrpc/responsemessage.cpp diff --git a/jsonrpc/responsemessage.h b/lib/jsonrpc/responsemessage.h similarity index 100% rename from jsonrpc/responsemessage.h rename to lib/jsonrpc/responsemessage.h diff --git a/config/ax_boost_base.m4 b/m4/ax_boost_base.m4 similarity index 100% rename from config/ax_boost_base.m4 rename to m4/ax_boost_base.m4 diff --git a/config/ax_boost_signals.m4 b/m4/ax_boost_signals.m4 similarity index 100% rename from config/ax_boost_signals.m4 rename to m4/ax_boost_signals.m4 diff --git a/config/ax_boost_system.m4 b/m4/ax_boost_system.m4 similarity index 100% rename from config/ax_boost_system.m4 rename to m4/ax_boost_system.m4 diff --git a/config/ax_boost_thread.m4 b/m4/ax_boost_thread.m4 similarity index 100% rename from config/ax_boost_thread.m4 rename to m4/ax_boost_thread.m4 diff --git a/config/ax_boost_unit_test_framework.m4 b/m4/ax_boost_unit_test_framework.m4 similarity index 100% rename from config/ax_boost_unit_test_framework.m4 rename to m4/ax_boost_unit_test_framework.m4 diff --git a/config/ax_check_openssl.m4 b/m4/ax_check_openssl.m4 similarity index 100% rename from config/ax_check_openssl.m4 rename to m4/ax_check_openssl.m4 diff --git a/config/ax_cxx_gcc_abi_demangle.m4 b/m4/ax_cxx_gcc_abi_demangle.m4 similarity index 100% rename from config/ax_cxx_gcc_abi_demangle.m4 rename to m4/ax_cxx_gcc_abi_demangle.m4 diff --git a/config/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4 similarity index 100% rename from config/ax_prog_doxygen.m4 rename to m4/ax_prog_doxygen.m4 diff --git a/config/ax_set_version_info.m4 b/m4/ax_set_version_info.m4 similarity index 100% rename from config/ax_set_version_info.m4 rename to m4/ax_set_version_info.m4 diff --git a/config/ax_spec_file.m4 b/m4/ax_spec_file.m4 similarity index 100% rename from config/ax_spec_file.m4 rename to m4/ax_spec_file.m4 diff --git a/config/ax_spec_package_version.m4 b/m4/ax_spec_package_version.m4 similarity index 100% rename from config/ax_spec_package_version.m4 rename to m4/ax_spec_package_version.m4