get rid of officecfg/Package_tools.mk

Change-Id: If549f6f5fba14067290b9ec0325381e6d590a472

3 files changed, 8 insertions, 44 deletions

diff --git a/officecfg/Module_officecfg.mk b/officecfg/Module_officecfg.mk
index 0e1e94396e96..45002eb90220 100644
--- a/officecfg/Module_officecfg.mk
+++ b/officecfg/Module_officecfg.mk
@@ -23,7 +23,6 @@ include $(SRCDIR)/officecfg/files.mk
 $(eval $(call gb_Module_add_targets,officecfg,\
     CustomTarget_registry \
     Package_misc \
-    Package_tools \
     Configuration_officecfg \
 ))
 
diff --git a/officecfg/Package_tools.mk b/officecfg/Package_tools.mk
deleted file mode 100644
index 040d2b8fe04a..000000000000
--- a/officecfg/Package_tools.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-# this package contains stuff that is used during the build
-
-$(eval $(call gb_Package_Package,officecfg_tools,$(SRCDIR)/officecfg))
-
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/alllang.xsl,util/alllang.xsl))
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/schema_val.xsl,util/schema_val.xsl))
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/schema_trim.xsl,util/schema_trim.xsl))
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/resource.xsl,util/resource.xsl))
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/sanity.xsl,util/sanity.xsl))
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/data_val.xsl,util/data_val.xsl))
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/delcomment.sed,util/delcomment.sed))
-
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/registry/data.dtd,registry/data.dtd))
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/registry/component-update.dtd,registry/component-update.dtd))
-$(eval $(call gb_Package_add_file,officecfg_tools,xml/registry/component-schema.dtd,registry/component-schema.dtd))
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index cda32c4d1ed7..eec45fb98461 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -62,10 +62,10 @@ endef
 
 gb_Configuration_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG))
 
-gb_XcsTarget_XSLT_SchemaVal := $(OUTDIR)/xml/processing/schema_val.xsl
-gb_XcsTarget_XSLT_Sanity := $(OUTDIR)/xml/processing/sanity.xsl
-gb_XcsTarget_XSLT_SchemaTrim := $(OUTDIR)/xml/processing/schema_trim.xsl
-gb_XcsTarget_DTD_Schema := $(OUTDIR)/xml/registry/component-schema.dtd
+gb_XcsTarget_XSLT_SchemaVal := $(SRCDIR)/officecfg/util/schema_val.xsl
+gb_XcsTarget_XSLT_Sanity := $(SRCDIR)/officecfg/util/sanity.xsl
+gb_XcsTarget_XSLT_SchemaTrim := $(SRCDIR)/officecfg/util/schema_trim.xsl
+gb_XcsTarget_DTD_Schema := $(SRCDIR)/officecfg/registry/component-schema.dtd
 
 define gb_XcsTarget__command
 $(call gb_Output_announce,$(2),$(true),XCS,1)
@@ -103,9 +103,9 @@ $(call gb_XcsTarget_get_clean_target,%) :
 
 # XcuDataTarget class
 
-gb_XcuTarget_XSLT_AllLang := $(OUTDIR)/xml/processing/alllang.xsl
-gb_XcuDataTarget_XSLT_DataVal := $(OUTDIR)/xml/processing/data_val.xsl
-gb_XcuDataTarget_DTD_ComponentUpdate := $(OUTDIR)/xml/registry/component-update.dtd
+gb_XcuTarget_XSLT_AllLang := $(SRCDIR)/officecfg/util/alllang.xsl
+gb_XcuDataTarget_XSLT_DataVal := $(SRCDIR)/officecfg/util/data_val.xsl
+gb_XcuDataTarget_DTD_ComponentUpdate := $(SRCDIR)/officecfg/registry/component-update.dtd
 
 define gb_XcuDataTarget__command
 $(call gb_Output_announce,$(2),$(true),XCU,2)
@@ -179,7 +179,7 @@ gb_XcuLangpackTarget__get_name_with_lang = $(basename $(1))-$(2)$(suffix $(1))
 gb_XcuLangpackTarget__get_target_with_lang = \
  $(call gb_XcuLangpackTarget_get_target,$(call gb_XcuLangpackTarget__get_name_with_lang,$(1),$(2)))
 
-gb_XcuLangpackTarget_SED_delcomment := $(OUTDIR)/xml/processing/delcomment.sed
+gb_XcuLangpackTarget_SED_delcomment := $(SRCDIR)/officecfg/util/delcomment.sed
 
 define gb_XcuLangpackTarget__command
 $(call gb_Output_announce,$(2),$(true),XCL,1)