summaryrefslogtreecommitdiff
path: root/odk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-04-26 17:39:45 +0200
committerMichael Stahl <mstahl@redhat.com>2013-06-04 12:00:57 +0200
commiteb8cbbea9117f26d2977d95f9aad488dc9cbb47e (patch)
tree5249c915b056f91a938ab3b5bde31db606426078 /odk
parentd60d1300f56d008056ccc8739e67495ba31cad97 (diff)
odk: clean up CustomTarget_doxygen.mk
- give right path to STRIP_FROM_PATH - prefix vars - depend on makefile - only call cygpath in rule Change-Id: Iceef191751b82a423be354db1f0a3ca4fc213e04
Diffstat (limited to 'odk')
-rw-r--r--odk/CustomTarget_doxygen.mk32
1 files changed, 14 insertions, 18 deletions
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index eae8ba1b1c73..182989b355ab 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -9,11 +9,9 @@
$(eval $(call gb_CustomTarget_CustomTarget,odk/docs/cpp))
-CPPDOCREFNAME := "$(PRODUCTNAME) $(PRODUCTVERSION) SDK C/C++ API Reference"
-
-odk_INCDIRLIST := sal salhelper rtl osl typelib uno cppu cppuhelper \
+odk_cpp_INCDIRLIST := sal salhelper rtl osl typelib uno cppu cppuhelper \
$(if $(filter WNT,$(OS)),systools)
-odk_INCFILELIST := com/sun/star/uno/Any.h \
+odk_cpp_INCFILELIST := com/sun/star/uno/Any.h \
com/sun/star/uno/Any.hxx \
com/sun/star/uno/genfunc.h \
com/sun/star/uno/genfunc.hxx \
@@ -25,29 +23,27 @@ odk_INCFILELIST := com/sun/star/uno/Any.h \
com/sun/star/uno/Type.hxx
# Cygwin Doxygen needs unix paths
-DOXY_INCLUDEDIR := $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include
-DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/main.dox $(SRCDIR)/include/sal/log-areas.dox \
- $(addprefix $(DOXY_INCLUDEDIR)/,$(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 $(call gb_CustomTarget_get_workdir,odk/docs/cpp)/ref),\
- $(call gb_CustomTarget_get_workdir,odk/docs/cpp)/ref)
-DOXY_STRIP_PATH := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(DOXY_INCLUDEDIR)),$(DOXY_INCLUDEDIR))
-
+odk_cygwin_path = $(if $(filter WNT,$(OS)),$(shell cygpath -u $(1)),$(1))
+odk_cpp_PREFIX := $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/
+odk_cpp_DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/main.dox $(SRCDIR)/include/sal/log-areas.dox \
+ $(addprefix $(odk_cpp_PREFIX),$(odk_cpp_INCDIRLIST) $(odk_cpp_INCFILELIST))
+odk_cpp_DOXY_WORKDIR := $(call gb_CustomTarget_get_workdir,odk/docs/cpp)/ref
$(eval $(call gb_CustomTarget_register_targets,odk/docs/cpp,\
Doxyfile \
doxygen.log \
))
-$(call gb_CustomTarget_get_workdir,odk/docs/cpp)/Doxyfile : $(SRCDIR)/odk/pack/gendocu/Doxyfile
+$(call gb_CustomTarget_get_workdir,odk/docs/cpp)/Doxyfile : \
+ $(SRCDIR)/odk/pack/gendocu/Doxyfile \
+ $(gb_Module_CURRENTMAKEFILE)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
- sed -e 's!^INPUT = %$$!INPUT = $(DOXY_INPUT)!' \
- -e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = $(DOXY_WORKDIR)!' \
- -e 's!^PROJECT_BRIEF = %$$!PROJECT_BRIEF = $(CPPDOCREFNAME)!' \
+ sed -e 's!^INPUT = %$$!INPUT = $(call odk_cygwin_path,$(odk_cpp_DOXY_INPUT))!' \
+ -e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = $(call odk_cygwin_path,$(odk_cpp_DOXY_WORKDIR))!' \
+ -e 's!^PROJECT_BRIEF = %$$!PROJECT_BRIEF = "$(PRODUCTNAME) $(PRODUCTVERSION) SDK C/C++ API Reference"!' \
-e 's!^PROJECT_NAME = %$$!PROJECT_NAME = $(PRODUCTNAME)!' \
-e 's!^QUIET = %$$!QUIET = $(if $(VERBOSE),NO,YES)!' \
- -e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(DOXY_STRIP_PATH)!' \
+ -e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(call odk_cygwin_path,$(odk_cpp_PREFIX))!' \
$< > $@
$(call gb_CustomTarget_get_workdir,odk/docs/cpp)/doxygen.log : \