summaryrefslogtreecommitdiff
path: root/odk
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-03-18 21:55:24 -0400
committerPeter Foley <pefoley2@verizon.net>2013-03-18 21:57:02 -0400
commit980c1179bbde47bab53410794795781d0e61e82a (patch)
tree2c92e8a6ddce8f75bd32211484223accac16e4c0 /odk
parentb6b49c0f6bc797558b6ce08fa756efe474a8011b (diff)
cleanup doxygen warnings
Change-Id: I9181cad5bfa93f9e8b3d944b2b50a3ccc0b42595
Diffstat (limited to 'odk')
-rw-r--r--odk/CustomTarget_doxygen.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index 626d05519b3d..2aa3832913f1 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -28,13 +28,16 @@ odk_INCFILELIST := com/sun/star/uno/Any.h \
com/sun/star/uno/Type.hxx
# Cygwin Doxygen needs unix paths
-DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/main.dox $(addprefix $(OUTDIR)/inc/,$(odk_INCDIRLIST) $(odk_INCFILELIST))
+DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/main.dox $(SRCDIR)/sal/inc/sal/log-areas.dox \
+ $(addprefix $(OUTDIR)/inc/,$(odk_INCDIRLIST) $(odk_INCFILELIST))
DOXY_INPUT := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(DOXY_INPUT)),$(DOXY_INPUT))
DOXY_WORKDIR := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(odk_WORKDIR)/docs/cpp/ref),$(odk_WORKDIR)/docs/cpp/ref)
DOXY_STRIP_PATH := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(OUTDIR)/inc),$(OUTDIR)/inc)
DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \
$(SRCDIR)/odk/pack/gendocu/main.dox \
+ $(SRCDIR)/sal/inc/sal/log-areas.dox \
$(call gb_Package_get_target,sal_odk_headers) \
+ $(call gb_Package_get_target,sal_generated) \
$(call gb_Package_get_target,salhelper_odk_headers) \
$(call gb_Package_get_target,cppu_odk_headers) \
$(call gb_Package_get_target,cppuhelper_odk_headers) \
@@ -52,6 +55,6 @@ $(odk_WORKDIR)/docs/cpp/ref/index.html: $(DOXY_DEPS)
-e 's!^QUIET = %$$!QUIET = $(if $(VERBOSE),NO,YES)!' \
-e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(DOXY_STRIP_PATH)!' \
$< > $(odk_WORKDIR)/Doxyfile
- $(DOXYGEN) $(odk_WORKDIR)/Doxyfile > /dev/null
+ $(DOXYGEN) $(odk_WORKDIR)/Doxyfile > $(odk_WORKDIR)/doxygen.log
# vim: set noet sw=4 ts=4: