diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-03 21:40:26 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-06-04 12:01:10 +0200 |
| commit | 4146cef50c1d56df0f18878732c01c0d968f6163 (patch) | |
| tree | d083139376f9963ceb9bf744aec2763cd3b48dcd /odk | |
| parent | baa69cccf38c848940061fb2d3fec5034ae31d6b (diff) | |
odk: package doxygen IDL docs
Change-Id: I1613ce8cf9b8248bb5d5e546df7310154e11b830
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_check.mk | 2 | ||||
| -rw-r--r-- | odk/GeneratedPackage_cpp_docs.mk | 16 | ||||
| -rw-r--r-- | odk/GeneratedPackage_odk_doxygen.mk | 17 | ||||
| -rw-r--r-- | odk/Module_odk.mk | 2 |
4 files changed, 19 insertions, 18 deletions
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index cc95d5caec72..ef85fd2f2641 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_docs)) \ + $(if $(DOXYGEN),$(call gb_GeneratedPackage_get_target,odk_doxygen)) \ $(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/GeneratedPackage_cpp_docs.mk b/odk/GeneratedPackage_cpp_docs.mk deleted file mode 100644 index 4cd7ceab2392..000000000000 --- a/odk/GeneratedPackage_cpp_docs.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_docs,$(call gb_CustomTarget_get_workdir,odk/docs))) - -$(eval $(call gb_GeneratedPackage_use_customtarget,odk_docs,odk/docs)) - -$(eval $(call gb_GeneratedPackage_add_dir,odk_docs,$(gb_Package_SDKDIRNAME)/docs/cpp/ref,cpp/ref)) - -# vim: set noet sw=4 ts=4: diff --git a/odk/GeneratedPackage_odk_doxygen.mk b/odk/GeneratedPackage_odk_doxygen.mk new file mode 100644 index 000000000000..b78d25d33cda --- /dev/null +++ b/odk/GeneratedPackage_odk_doxygen.mk @@ -0,0 +1,17 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_doxygen,$(call gb_CustomTarget_get_workdir,odk/docs))) + +$(eval $(call gb_GeneratedPackage_use_customtarget,odk_doxygen,odk/docs)) + +$(eval $(call gb_GeneratedPackage_add_dir,odk_doxygen,$(gb_Package_SDKDIRNAME)/docs/cpp/ref,cpp/ref)) +$(eval $(call gb_GeneratedPackage_add_dir,odk_doxygen,$(gb_Package_SDKDIRNAME)/docs/idl/ref,idl/ref)) + +# vim: set noet sw=4 ts=4: diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index f7cc7771d570..c710f8d4798d 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,odk,\ $(if $(filter WNT,$(OS)),Package_cli) \ $(if $(DOXYGEN),\ CustomTarget_doxygen \ - GeneratedPackage_cpp_docs \ + GeneratedPackage_odk_doxygen \ ) \ CustomTarget_html \ CustomTarget_settings \ |