From f33b292d541a54c7d9033b04dc1de191c1513a3c Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sun, 21 Apr 2013 12:22:12 +0200
Subject: [PATCH] gbuild: use Package for delivering smoketestdoc.sxw

Change-Id: I056a9457aee725e1c8f992ee2553e79f536920ee
---
 smoketest/Module_smoketest.mk     |  1 +
 smoketest/Package_smoketestdoc.mk | 14 ++++++++++++++
 smoketest/Zip_smoketestdoc.mk     | 10 ----------
 3 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 smoketest/Package_smoketestdoc.mk

diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
index 25ca96c9cab3..61e93ae6d51c 100644
--- a/smoketest/Module_smoketest.mk
+++ b/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 \
 ))
 
diff --git a/smoketest/Package_smoketestdoc.mk b/smoketest/Package_smoketestdoc.mk
new file mode 100644
index 000000000000..cac1d6581061
--- /dev/null
+++ b/smoketest/Package_smoketestdoc.mk
@@ -0,0 +1,14 @@
+# -*- 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:
diff --git a/smoketest/Zip_smoketestdoc.mk b/smoketest/Zip_smoketestdoc.mk
index d39e9f1f2385..6823e5217ece 100644
--- a/smoketest/Zip_smoketestdoc.mk
+++ b/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: