ritually kill odkcommon.zip

Change-Id: I0a814e3f5605340f00d4b48e83ce26792abec067

7 files changed, 22 insertions, 65 deletions

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index a5995fc44cd8..ab515c989c1b 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -45,8 +45,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated) \
 		$(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) \
-		$(call gb_PackageSet_get_target,odk_autodoc) \
-		$(call gb_CustomTarget_get_target,odk/odkcommon)
+		$(call gb_PackageSet_get_target,odk_autodoc)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
 	$(call gb_Helper_print_on_error,\
 		$(PERL) $< \
diff --git a/odk/CustomTarget_classes.mk b/odk/CustomTarget_classes.mk
index f813bccd203e..82f524797aa5 100644
--- a/odk/CustomTarget_classes.mk
+++ b/odk/CustomTarget_classes.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_JavaClassSet_add_sourcefiles,loader,\
 	odk/source/com/sun/star/lib/loader/WinRegKeyException \
 ))
 
-$(odk_WORKDIR)/classes/java.done: $(call gb_JavaClassSet_get_target,loader)
+$(call gb_CustomTarget_get_workdir,odk/odkcommon/classes)/java.done: $(call gb_JavaClassSet_get_target,loader)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1)
 	cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@) && \
 	touch $@
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index e9a33eee9d59..bddb0f358c1f 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/odkcommon/docs/cpp/ref))
+$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/cpp))
 
 CPPDOCREFNAME := "$(PRODUCTNAME) $(PRODUCTVERSION) SDK C/C++ API Reference"
 
@@ -28,25 +28,33 @@ odk_INCFILELIST := com/sun/star/uno/Any.h \
 DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/main.dox $(SRCDIR)/include/sal/log-areas.dox \
 	$(addprefix $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,$(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_WORKDIR := $(if $(filter WNT,$(OS)),\
+	$(shell cygpath -u $(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/ref),\
+	$(call gb_CustomTarget_get_workdir,odk/odkcommon/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)/include/sal/log-areas.dox \
-	$(call gb_PackageSet_get_target,odk_headers)
 
 
-$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/docs/cpp/ref,index.html))
+$(eval $(call gb_CustomTarget_register_targets,odk/odkcommon/docs/cpp,\
+	Doxyfile \
+	doxygen.log \
+))
 
-$(odk_WORKDIR)/docs/cpp/ref/index.html: $(DOXY_DEPS)
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1)
+$(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/Doxyfile : $(SRCDIR)/odk/pack/gendocu/Doxyfile
+	$(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)!' \
 		-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 && \
-	$(DOXYGEN) $(odk_WORKDIR)/Doxyfile > $(odk_WORKDIR)/doxygen.log
+		$< > $@
+
+$(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/doxygen.log : \
+		$(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/Doxyfile \
+		$(SRCDIR)/include/sal/log-areas.dox \
+		$(SRCDIR)/odk/pack/gendocu/main.dox \
+		$(call gb_PackageSet_get_target,odk_headers)
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1)
+	$(DOXYGEN) $< > $@
 
 # vim: set noet sw=4 ts=4:
diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk
deleted file mode 100644
index 627addf29da4..000000000000
--- a/odk/CustomTarget_odkcommon.mk
+++ /dev/null
@@ -1,20 +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/.
-#
-
-odk_WORKDIR := $(call gb_CustomTarget_get_workdir,odk/odkcommon)
-odkcommon_ZIPLIST :=
-odkcommon_ZIPDEPS :=
-
-$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon))
-
-$(call gb_CustomTarget_get_target,odk/odkcommon): \
-	$(call gb_CustomTarget_get_target,odk/odkcommon/idl) \
-	$(call gb_CustomTarget_get_target,odk/odkcommon/include)
-
-# vim: set noet sw=4 ts=4:
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 35865e855759..94f8fc1cd13d 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -10,7 +10,6 @@
 $(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 \
@@ -64,12 +63,6 @@ $(eval $(call gb_Module_add_targets,odk,\
 ))
 endif
 
-# This apparently needs to come last, as the various CustomTarget_* add to
-# odkcommon_ZIPLIST that is used here:
-$(eval $(call gb_Module_add_targets,odk,\
-	Zip_odkcommon \
-))
-
 $(eval $(call gb_Module_add_check_targets,odk,\
 	CppunitTest_checkapi \
 	CustomTarget_allheaders \
diff --git a/odk/Zip_cppdocs.mk b/odk/Zip_cppdocs.mk
index 1904cdb54416..1f86757f9471 100644
--- a/odk/Zip_cppdocs.mk
+++ b/odk/Zip_cppdocs.mk
@@ -15,6 +15,6 @@ $(eval $(call gb_Zip_add_files,cppdocs,\
 
 $(eval $(call gb_Zip_add_commandoptions,cppdocs,-r))
 
-$(call gb_Zip_get_target,cppdocs) : $(call gb_CustomTarget_get_target,odk/odkcommon/docs/cpp/ref)
+$(call gb_Zip_get_target,cppdocs) : $(call gb_CustomTarget_get_target,odk/odkcommon/docs/cpp)
 
 # vim: set noet sw=4 ts=4:
diff --git a/odk/Zip_odkcommon.mk b/odk/Zip_odkcommon.mk
deleted file mode 100644
index 11827bda39d5..000000000000
--- a/odk/Zip_odkcommon.mk
+++ /dev/null
@@ -1,23 +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_Zip_Zip,odkcommon,$(call gb_CustomTarget_get_workdir,odk/odkcommon)))
-
-$(eval $(call gb_Zip_add_files,odkcommon,\
-	$(odkcommon_ZIPLIST) \
-))
-
-$(eval $(call gb_Zip_add_commandoptions,odkcommon,-r))
-
-# Additional dependencies for the zip. Because we are zipping whole
-# directories, we cannot just depend on make to figure out from file
-# dependencies which custom targets need to be built.
-$(call gb_Zip_get_target,odkcommon) : $(odkcommon_ZIPDEPS)
-
-# vim: set noet sw=4 ts=4: