gbuild: use Package for delivering smoketestdoc.sxw

Change-Id: I056a9457aee725e1c8f992ee2553e79f536920ee

smoketest/Module_smoketest.mk

@@ -32,6 +32,7 @@ ifeq ($(CROSS_COMPILING),)
 $(eval $(call gb_Module_add_targets,smoketest,\
 	Library_smoketest \
 	Package_losmoketest \
+	Package_smoketestdoc \
 	Zip_smoketestdoc \
 ))
 

smoketest/Package_smoketestdoc.mk

+# -*- 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_Package_Package,smoketestdoc,$(WORKDIR)/Zip))
+
+$(eval $(call gb_Package_add_file,smoketestdoc,bin/smoketestdoc.sxw,smoketestdoc.zip))
+
+# vim: set noet sw=4 ts=4:

smoketest/Zip_smoketestdoc.mk

@@ -52,14 +52,4 @@ $(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/dialog-lc.xml))
 $(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/Standard/dialog-lb.xml))
 $(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/Standard/OptionsDlg.xml))
 
-$(call gb_Zip_get_final_target,smoketestdoc) : $(OUTDIR)/bin/smoketestdoc.sxw
-$(call gb_Zip_get_clean_target,smoketestdoc) : Clean_smoketestdoc_sxw
-
-$(OUTDIR)/bin/smoketestdoc.sxw : $(call gb_Zip_get_target,smoketestdoc) | $(OUTDIR)/bin/.dir
-	$(call gb_Deliver_deliver,$<,$@)
-
-.PHONY : Clean_smoketestdoc_sxw
-Clean_smoketestdoc_sxw :
-	rm -f $(OUTDIR)/bin/smoketestdoc.sxw
-
 # vim: set noet sw=4 ts=4: