diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-31 01:04:47 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-31 10:42:25 +0100 |
| commit | 45460cbd4333f619fefb721462f17fc13e4f887d (patch) | |
| tree | 7d95ad27912d24fa2fa9df66663355e1795f3a6d /extras | |
| parent | 60211134bc6aadd2c8bbcaf6fcda80971cb5fdd1 (diff) | |
move bundled binary OXT to new module external/misc_extensions
... and use ExtensionPackageSet to copy them to INSTDIR.
Change-Id: I3c77e986c308ffbabb5e55b93d3e04e6282bf4c9
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/Module_extras.mk | 6 | ||||
| -rw-r--r-- | extras/Package_extensions.mk | 59 |
2 files changed, 0 insertions, 65 deletions
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index b8429d80ff1a..c94b1e0195f0 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -59,12 +59,6 @@ $(eval $(call gb_Module_add_targets,extras,\ )) endif -ifeq ($(WITH_EXTRA_EXTENSIONS),YES) -$(eval $(call gb_Module_add_targets,extras,\ - Package_extensions \ -)) -endif - ifeq ($(WITH_EXTRA_FONT),YES) $(eval $(call gb_Module_add_targets,extras,\ ExternalPackage_extra_fonts \ diff --git a/extras/Package_extensions.mk b/extras/Package_extensions.mk deleted file mode 100644 index a88679eee2db..000000000000 --- a/extras/Package_extensions.mk +++ /dev/null @@ -1,59 +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/. -# - -# Technically these files do not belong to extras module, but they must -# be delivered from somewhere, so why not from extras... -$(eval $(call gb_Package_Package,extras_extensions,$(TARFILE_LOCATION))) - -$(eval $(call gb_Package_set_outdir,extras_extensions,$(OUTDIR))) - -ifneq ($(BARCODE_EXTENSION_PACK),) -$(eval $(call gb_Package_add_file,extras_extensions,bin/Barcode.oxt,$(BARCODE_EXTENSION_PACK))) -endif -ifneq ($(DIAGRAM_EXTENSION_PACK),) -$(eval $(call gb_Package_add_file,extras_extensions,bin/SmART.oxt,$(DIAGRAM_EXTENSION_PACK))) -endif -ifneq ($(GOOGLE_DOCS_EXTENSION_PACK),) -$(eval $(call gb_Package_add_file,extras_extensions,bin/gdocs.oxt,$(GOOGLE_DOCS_EXTENSION_PACK))) -endif -ifneq ($(HUNART_EXTENSION_PACK),) -$(eval $(call gb_Package_add_file,extras_extensions,bin/hunart.oxt,$(HUNART_EXTENSION_PACK))) -endif -ifneq ($(NUMBERTEXT_EXTENSION_PACK),) -$(eval $(call gb_Package_add_file,extras_extensions,bin/numbertext.oxt,$(NUMBERTEXT_EXTENSION_PACK))) -endif -ifneq ($(SUNTEMPLATES_DE_PACK),) -$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-de.oxt,$(SUNTEMPLATES_DE_PACK))) -endif -ifneq ($(SUNTEMPLATES_EN_US_PACK),) -$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-en-US.oxt,$(SUNTEMPLATES_EN_US_PACK))) -endif -ifneq ($(SUNTEMPLATES_ES_PACK),) -$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-es.oxt,$(SUNTEMPLATES_ES_PACK))) -endif -ifneq ($(SUNTEMPLATES_FR_PACK),) -$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-fr.oxt,$(SUNTEMPLATES_FR_PACK))) -endif -ifneq ($(SUNTEMPLATES_HU_PACK),) -$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-hu.oxt,$(SUNTEMPLATES_HU_PACK))) -endif -ifneq ($(SUNTEMPLATES_IT_PACK),) -$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-it.oxt,$(SUNTEMPLATES_IT_PACK))) -endif -ifneq ($(TYPO_EXTENSION_PACK),) -$(eval $(call gb_Package_add_file,extras_extensions,bin/typo.oxt,$(TYPO_EXTENSION_PACK))) -endif -ifneq ($(VALIDATOR_EXTENSION_PACK),) -$(eval $(call gb_Package_add_file,extras_extensions,bin/Validator.oxt,$(VALIDATOR_EXTENSION_PACK))) -endif -ifneq ($(WATCH_WINDOW_EXTENSION_PACK),) -$(eval $(call gb_Package_add_file,extras_extensions,bin/WatchWindow.oxt,$(WATCH_WINDOW_EXTENSION_PACK))) -endif - -# vim: set noet sw=4 ts=4: |