From 56bb796673657c9f8683bbff08070c77c4c889cd Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Thu, 24 Oct 2013 16:19:50 +0200
Subject: [PATCH] xmlhelp: remove Package_xsl

Change-Id: Id0a5213b39886e2f6929f7ff2c014ed861d1da91
---
 solenv/gbuild/Extension.mk  | 12 ++++++------
 solenv/gbuild/HelpTarget.mk |  8 ++++----
 xmlhelp/Module_xmlhelp.mk   |  1 -
 xmlhelp/Package_xsl.mk      | 18 ------------------
 4 files changed, 10 insertions(+), 29 deletions(-)
 delete mode 100644 xmlhelp/Package_xsl.mk

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 42da3635c3a1..da5be96e1299 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -440,19 +440,19 @@ define gb_Extension__compile_help_onelang
 $(call gb_Extension_get_rootdir,$(1))/help/$(2).done : \
         $(gb_Extension_HELPINDEXERDEPS) \
         $(gb_Extension_HELPLINKERDEPS) \
-        $(OUTDIR_FOR_BUILD)/bin/embed.xsl \
-        $(OUTDIR_FOR_BUILD)/bin/idxcaption.xsl \
-        $(OUTDIR_FOR_BUILD)/bin/idxcontent.xsl | \
+        $(SRCDIR)/xmlhelp/util/embed.xsl \
+        $(SRCDIR)/xmlhelp/util/idxcaption.xsl \
+        $(SRCDIR)/xmlhelp/util/idxcontent.xsl | \
         $(call gb_Extension_get_rootdir,$(1))/help/.dir
 	$$(call gb_Output_announce,$(1) $(2),$(true),XHC,3)
 	$$(call gb_Helper_abbreviate_dirs, \
         mkdir -p $$(basename $$@) && \
         $$(gb_Extension_HELPLINKERCOMMAND) -mod help \
             -extlangsrc $(call gb_Extension_get_workdir,$(1))/help/$(2) \
-            -sty $(OUTDIR_FOR_BUILD)/bin/embed.xsl \
+            -sty $(SRCDIR)/xmlhelp/util/embed.xsl \
             -extlangdest $$(basename $$@) \
-            -idxcaption $(OUTDIR_FOR_BUILD)/bin/idxcaption.xsl \
-            -idxcontent $(OUTDIR_FOR_BUILD)/bin/idxcontent.xsl \
+            -idxcaption $(SRCDIR)/xmlhelp/util/idxcaption.xsl \
+            -idxcontent $(SRCDIR)/xmlhelp/util/idxcontent.xsl \
             $$(HELPFILES) && \
         (cd $(call gb_Extension_get_workdir,$(1))/help/$(2) && \
             $$(gb_Extension_ZIPCOMMAND) -r $$(basename $$@)/help.jar \
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index a194d0b20dd0..da9e5af20315 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -269,10 +269,10 @@ endef
 
 gb_HelpLinkTarget_HELPLINKERDEPS := $(call gb_Executable_get_runtime_dependencies,HelpLinker)
 gb_HelpLinkTarget_HELPLINKERCOMMAND := $(call gb_Executable_get_command,HelpLinker)
-gb_HelpLinkTarget_COMPACTTARGET := $(OUTDIR)/bin/compact.xsl
-gb_HelpLinkTarget_EMBEDTARGET := $(OUTDIR)/bin/embed.xsl
-gb_HelpLinkTarget_IDXCAPTIONTARGET := $(OUTDIR)/bin/idxcaption.xsl
-gb_HelpLinkTarget_IDXCONTENTTARGET := $(OUTDIR)/bin/idxcontent.xsl
+gb_HelpLinkTarget_COMPACTTARGET := $(SRCDIR)/xmlhelp/util/compact.xsl
+gb_HelpLinkTarget_EMBEDTARGET := $(SRCDIR)/xmlhelp/util/embed.xsl
+gb_HelpLinkTarget_IDXCAPTIONTARGET := $(SRCDIR)/xmlhelp/util/idxcaption.xsl
+gb_HelpLinkTarget_IDXCONTENTTARGET := $(SRCDIR)/xmlhelp/util/idxcontent.xsl
 gb_HelpLinkTarget_DEPS := \
 	$(gb_HelpLinkTarget_HELPLINKERDEPS) \
 	$(gb_HelpLinkTarget_COMPACTTARGET) \
diff --git a/xmlhelp/Module_xmlhelp.mk b/xmlhelp/Module_xmlhelp.mk
index 5e5105d21bbf..1cba02aa7afc 100644
--- a/xmlhelp/Module_xmlhelp.mk
+++ b/xmlhelp/Module_xmlhelp.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,xmlhelp))
 $(eval $(call gb_Module_add_targets,xmlhelp,\
 	Library_tvhlp1 \
 	Library_ucpchelp1 \
-	Package_xsl \
 	Package_helpxsl \
 ))
 
diff --git a/xmlhelp/Package_xsl.mk b/xmlhelp/Package_xsl.mk
deleted file mode 100644
index f03e228d9a5b..000000000000
--- a/xmlhelp/Package_xsl.mk
+++ /dev/null
@@ -1,18 +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_Package_Package,xmlhelp_xsl,$(SRCDIR)/xmlhelp/util))
-
-$(eval $(call gb_Package_add_file,xmlhelp_xsl,bin/compact.xsl,compact.xsl))
-$(eval $(call gb_Package_add_file,xmlhelp_xsl,bin/embed.xsl,embed.xsl))
-$(eval $(call gb_Package_add_file,xmlhelp_xsl,bin/idxcaption.xsl,idxcaption.xsl))
-$(eval $(call gb_Package_add_file,xmlhelp_xsl,bin/idxcontent.xsl,idxcontent.xsl))
-$(eval $(call gb_Package_add_file,xmlhelp_xsl,bin/main_transform.xsl,main_transform.xsl))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab: