8 Jan
2018
8 Jan
'18
1:50 p.m.
Module: check_mk
Branch: master
Commit: 6f5b9ae74aecb44b7aa63ec010fe37a6be3d8e47
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f5b9ae74aecb4…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Mon Jan 8 14:44:18 2018 +0100
Moved Doxygen stuff to project directories.
Change-Id: If42464029a2fd70d117089753bd5273534291149
---
.gitignore | 1 -
Makefile | 10 +++++-----
livestatus/src/.gitignore | 1 +
livestatus/src/Makefile.am | 8 ++++++--
{doc => livestatus/src/doc}/Doxyfile | 4 ++--
{doc => livestatus/src/doc}/logo_mk.png | Bin
6 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5cd8ee9..9214b4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,6 @@ GRTAGS
GTAGS
RemoteSystemsTempFiles
aclocal.m4
-api
ar-lib
autom4te.cache/
ChangeLog
diff --git a/Makefile b/Makefile
index e7eae1d..989130b 100644
--- a/Makefile
+++ b/Makefile
@@ -63,8 +63,8 @@ CLANG_FORMAT := clang-format-$(CLANG_VERSION)
CLANG_TIDY := clang-tidy-$(CLANG_VERSION)
export RUN_CLANG_TIDY := run-clang-tidy-$(CLANG_VERSION).py
SCAN_BUILD := scan-build-$(CLANG_VERSION)
-CPPCHECK := cppcheck
-DOXYGEN := doxygen
+export CPPCHECK := cppcheck
+export DOXYGEN := doxygen
export IWYU_TOOL := iwyu_tool
# The Bear versions have a slightly tragic history: Due to the clang bug
@@ -374,7 +374,7 @@ install-minified-js: $(JAVASCRIPT_MINI)
# GNU standards here (see "Standard Targets for Users",
# https://www.gnu.org/prep/standards/html_node/Standard-Targets.html).
clean:
- rm -rf api clang-analyzer dist.tmp rpm.topdir *.rpm *.deb *.exe \
+ rm -rf clang-analyzer dist.tmp rpm.topdir *.rpm *.deb *.exe \
mk-livestatus-*.tar.gz \
$(NAME)-*.tar.gz *~ counters autochecks \
precompiled cache web/htdocs/js/*_min.js \
@@ -509,9 +509,9 @@ format:
# Note: You need the doxygen and graphviz packages.
documentation: config.h
- $(DOXYGEN) doc/Doxyfile
+ $(MAKE) -C livestatus/src documentation
ifeq ($(ENTERPRISE),yes)
- cd enterprise && $(DOXYGEN) doc/Doxyfile
+ $(MAKE) -C enterprise/core/src documentation
endif
# This dummy rule is called from subdirectories whenever one of the
diff --git a/livestatus/src/.gitignore b/livestatus/src/.gitignore
index d39fed4..9b04811 100644
--- a/livestatus/src/.gitignore
+++ b/livestatus/src/.gitignore
@@ -8,5 +8,6 @@ Makefile
Makefile.in
compile_commands.json
cppcheck-result.xml
+html/
livecheck
unixcat
diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am
index 9fef8b1..b90edc6 100644
--- a/livestatus/src/Makefile.am
+++ b/livestatus/src/Makefile.am
@@ -26,6 +26,7 @@ CLANG_VERSION ?= 5.0
BEAR ?= bear
CPPCHECK ?= cppcheck
+DOXYGEN ?= doxygen
IWYU_TOOL ?= iwyu_tool
RUN_CLANG_TIDY ?= run-clang-tidy-$(CLANG_VERSION).py
@@ -156,7 +157,7 @@ liblivestatus_a_SOURCES = \
pnp4nagios.cc \
strutil.cc
-.PHONY: tidy
+.PHONY: tidy iwyu cppcheck cppcheck-xml documentation
liblivestatus_a_CPPFLAGS = -I.. @BOOST_CPPFLAGS@
liblivestatus_a_CXXFLAGS = -fPIC
@@ -185,6 +186,9 @@ cppcheck: compile_commands.json
cppcheck-xml: compile_commands.json
$(CPPCHECK) -UCMC --enable=all --suppressions-list=cppcheck-suppressions.txt
--inline-suppr --project=compile_commands.json --quiet --template=gcc --xml
--xml-version=2 2> cppcheck-result.xml
+documentation:
+ $(DOXYGEN) doc/Doxyfile
+
all-local: livestatus.o
install-data-local:
@@ -193,4 +197,4 @@ install-data-local:
rm -f $(DESTDIR)$(pkglibdir)/liblivestatus.a
clean-local:
- rm -f *~
+ rm -rf *~ compile_commands.json cppcheck-result.xml html
diff --git a/doc/Doxyfile b/livestatus/src/doc/Doxyfile
similarity index 99%
rename from doc/Doxyfile
rename to livestatus/src/doc/Doxyfile
index e5c0daa..1e1a2a4 100644
--- a/doc/Doxyfile
+++ b/livestatus/src/doc/Doxyfile
@@ -58,7 +58,7 @@ PROJECT_LOGO = "doc/logo_mk.png"
# entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used.
-OUTPUT_DIRECTORY = "api"
+OUTPUT_DIRECTORY =
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and
@@ -790,7 +790,7 @@ WARN_LOGFILE =
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
# Note: If this tag is empty the current directory is searched.
-INPUT = "livestatus/src"
+INPUT =
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
diff --git a/doc/logo_mk.png b/livestatus/src/doc/logo_mk.png
similarity index 100%
rename from doc/logo_mk.png
rename to livestatus/src/doc/logo_mk.png