diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-26 18:40:56 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-06-04 12:00:57 +0200 |
| commit | 8b43736ca7eba8a9bf0b2421e267a987e5fdf209 (patch) | |
| tree | cd723c0dc6275204a87e3fa8502783f4a3458453 /odk | |
| parent | eb8cbbea9117f26d2977d95f9aad488dc9cbb47e (diff) | |
odk: generalize CustomTarget_doxygen a bit
Change-Id: Ic3f2d42121b5423d67c4c79302b02ac495ac9640
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_check.mk | 2 | ||||
| -rw-r--r-- | odk/CustomTarget_doxygen.mk | 14 | ||||
| -rw-r--r-- | odk/GeneratedPackage_cpp_docs.mk | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index fb5b2d5aa34a..cc95d5caec72 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -28,7 +28,7 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(SRCDIR)/odk/util/check.pl \ - $(if $(DOXYGEN),$(call gb_GeneratedPackage_get_target,odk_cpp_docs)) \ + $(if $(DOXYGEN),$(call gb_GeneratedPackage_get_target,odk_docs)) \ $(call gb_Package_get_target,odk_bin) \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \ $(call gb_Package_get_target,odk_config) \ diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index 182989b355ab..b093648ce967 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_CustomTarget_CustomTarget,odk/docs/cpp)) +$(eval $(call gb_CustomTarget_CustomTarget,odk/docs)) odk_cpp_INCDIRLIST := sal salhelper rtl osl typelib uno cppu cppuhelper \ $(if $(filter WNT,$(OS)),systools) @@ -29,12 +29,12 @@ odk_cpp_DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/main.dox $(SRCDIR)/include/sal/ $(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 \ +$(eval $(call gb_CustomTarget_register_targets,odk/docs,\ + cpp/Doxyfile \ + cpp/doxygen.log \ )) -$(call gb_CustomTarget_get_workdir,odk/docs/cpp)/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) @@ -46,8 +46,8 @@ $(call gb_CustomTarget_get_workdir,odk/docs/cpp)/Doxyfile : \ -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 : \ - $(call gb_CustomTarget_get_workdir,odk/docs/cpp)/Doxyfile \ +$(call gb_CustomTarget_get_workdir,odk/docs)/cpp/doxygen.log : \ + $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile \ $(SRCDIR)/include/sal/log-areas.dox \ $(SRCDIR)/odk/pack/gendocu/main.dox \ $(call gb_PackageSet_get_target,odk_headers) diff --git a/odk/GeneratedPackage_cpp_docs.mk b/odk/GeneratedPackage_cpp_docs.mk index 313980f8355d..4cd7ceab2392 100644 --- a/odk/GeneratedPackage_cpp_docs.mk +++ b/odk/GeneratedPackage_cpp_docs.mk @@ -7,10 +7,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_cpp_docs,$(call gb_CustomTarget_get_workdir,odk/docs/cpp))) +$(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_docs,$(call gb_CustomTarget_get_workdir,odk/docs))) -$(eval $(call gb_GeneratedPackage_use_customtarget,odk_cpp_docs,odk/docs/cpp)) +$(eval $(call gb_GeneratedPackage_use_customtarget,odk_docs,odk/docs)) -$(eval $(call gb_GeneratedPackage_add_dir,odk_cpp_docs,$(gb_Package_SDKDIRNAME)/docs/cpp/ref,ref)) +$(eval $(call gb_GeneratedPackage_add_dir,odk_docs,$(gb_Package_SDKDIRNAME)/docs/cpp/ref,cpp/ref)) # vim: set noet sw=4 ts=4: |