clean up install. of C++ docs

Change-Id: I51841a8c92cb73912757fcc0766b11d8f9be4b77
Reviewed-on: https://gerrit.libreoffice.org/3587
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

8 files changed, 42 insertions, 6 deletions

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 85113b38d1f0..e6754c968bfb 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -27,6 +27,7 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\
 
 $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(SRCDIR)/odk/util/check.pl \
+		$(if $(DOXYGEN),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/cpp/ref)) \
 		$(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 fbdefca8f9cf..e9a33eee9d59 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -9,9 +9,6 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/cpp/ref))
 
-odkcommon_ZIPLIST += docs/cpp/ref
-odkcommon_ZIPDEPS += $(odk_WORKDIR)/docs/cpp/ref/index.html
-
 CPPDOCREFNAME := "$(PRODUCTNAME) $(PRODUCTVERSION) SDK C/C++ API Reference"
 
 odk_INCDIRLIST := sal salhelper rtl osl typelib uno cppu cppuhelper \
@@ -49,7 +46,7 @@ $(odk_WORKDIR)/docs/cpp/ref/index.html: $(DOXY_DEPS)
 		-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)!' \
-		$< > $(odk_WORKDIR)/Doxyfile
+		$< > $(odk_WORKDIR)/Doxyfile && \
 	$(DOXYGEN) $(odk_WORKDIR)/Doxyfile > $(odk_WORKDIR)/doxygen.log
 
 # vim: set noet sw=4 ts=4:
diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk
index 6b500e86fb14..1201fdf3ddcc 100644
--- a/odk/CustomTarget_odkcommon.mk
+++ b/odk/CustomTarget_odkcommon.mk
@@ -14,7 +14,6 @@ odkcommon_ZIPDEPS :=
 $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon))
 
 $(call gb_CustomTarget_get_target,odk/odkcommon): \
-	$(if $(DOXYGEN),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/cpp/ref)) \
 	$(if $(SOLAR_JAVA),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/java/ref)) \
 	$(call gb_CustomTarget_get_target,odk/odkcommon/docs/common/ref) \
 	$(call gb_CustomTarget_get_target,odk/odkcommon/classes) \
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index c17c57419e03..2c25c79af739 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -12,7 +12,10 @@ $(eval $(call gb_Module_Module,odk))
 $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_odkcommon \
 	$(if $(filter WNT,$(OS)),Package_cli) \
-	$(if $(DOXYGEN),CustomTarget_doxygen) \
+	$(if $(DOXYGEN),\
+		CustomTarget_doxygen \
+		Zip_cppdocs \
+	) \
 	CustomTarget_html \
 	CustomTarget_settings \
 	CustomTarget_autodoc \
diff --git a/odk/Zip_cppdocs.mk b/odk/Zip_cppdocs.mk
new file mode 100644
index 000000000000..1904cdb54416
--- /dev/null
+++ b/odk/Zip_cppdocs.mk
@@ -0,0 +1,20 @@
+# -*- 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_Zip_Zip,cppdocs,$(call gb_CustomTarget_get_workdir,odk/odkcommon)))
+
+$(eval $(call gb_Zip_add_files,cppdocs,\
+	docs/cpp/ref \
+))
+
+$(eval $(call gb_Zip_add_commandoptions,cppdocs,-r))
+
+$(call gb_Zip_get_target,cppdocs) : $(call gb_CustomTarget_get_target,odk/odkcommon/docs/cpp/ref)
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_sdkoo.mk b/scp2/InstallModule_sdkoo.mk
index b98ad852f587..6bb2c5483a11 100644
--- a/scp2/InstallModule_sdkoo.mk
+++ b/scp2/InstallModule_sdkoo.mk
@@ -9,6 +9,12 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/sdkoo))
 
+ifneq ($(DOXYGEN),)
+$(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\
+	-DDOXYGEN \
+))
+endif
+
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/sdkoo,\
     scp2/source/sdkoo/sdkoo \
 ))
diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp
index ed40abd9d595..2d837f95b7b0 100644
--- a/scp2/source/sdkoo/module_sdkoo.scp
+++ b/scp2/source/sdkoo/module_sdkoo.scp
@@ -46,6 +46,7 @@ Module gid_Module_Optional_Sdkoo
         gid_File_Package_odk_settings,
         gid_File_Package_odk_settings_generated,
         gid_File_Package_odk_unowinreg,
+        gid_File_Zip_cppdocs,
         gid_File_Zip_Odkexamples,
         gid_File_Zip_Odkcommon,
         gid_File_Zip_OdkIdl_udkapi,
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index a6d4207fcf42..10301af67ec1 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -208,6 +208,15 @@ File gid_File_Package_odk_unowinreg
 End
 #endif
 
+#if defined(DOXYGEN)
+File gid_File_Zip_cppdocs
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Basis_Sdk;
+    Name = "cppdocs.zip";
+    Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+End
+#endif
+
 File gid_File_Zip_Odkexamples
     TXT_FILE_BODY;
     Dir = FILELIST_SDK_DIR;