diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-09-17 17:39:10 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-09-17 17:41:28 +0300 |
commit | 332f6a5f997677a3468c47a7b7d5b7c448809293 (patch) | |
tree | a3beb492805384aba64a75c8e0d97233df5c65c9 /ure | |
parent | 5e648ef800a4cf853289e50744aa266ac4651fd1 (diff) |
The URE unorc is now set up in instsetoo_native/CustomTarget_setup.mk
So no need to expand it at configure time in ure/source/unorc, and no need to
handle the related builddir!=srcdir complications.
Change-Id: Ifa34d25fab9ad2da13ed039bf6c5921b0fb58703
Diffstat (limited to 'ure')
-rw-r--r-- | ure/Module_ure.mk | 1 | ||||
-rw-r--r-- | ure/Package_builddir_install.mk | 18 | ||||
-rw-r--r-- | ure/source/unorc.in | 23 |
3 files changed, 0 insertions, 42 deletions
diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk index 4d8c2c0aeda9..88cbc71b31f2 100644 --- a/ure/Module_ure.mk +++ b/ure/Module_ure.mk @@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,ure)) $(eval $(call gb_Module_add_targets,ure,\ Package_install \ - Package_builddir_install \ Rdb_ure \ )) diff --git a/ure/Package_builddir_install.mk b/ure/Package_builddir_install.mk deleted file mode 100644 index 49defbc5404b..000000000000 --- a/ure/Package_builddir_install.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,ure_builddir_install,$(BUILDDIR)/ure/source)) - -ifneq ($(CROSS_COMPILING),) -$(eval $(call gb_Package_add_files,ure_builddir_install,$(LIBO_URE_ETC_FOLDER),\ - $(if $(filter unorc,$(call gb_Helper_get_rcfile,uno)),$(call gb_Helper_get_rcfile,uno)) \ -)) -endif - -# vim:set noet sw=4 ts=4: diff --git a/ure/source/unorc.in b/ure/source/unorc.in deleted file mode 100644 index bc0ecbe19d60..000000000000 --- a/ure/source/unorc.in +++ /dev/null @@ -1,23 +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 . -# -[Bootstrap] -URE_INTERNAL_LIB_DIR=${BRAND_BASE_DIR}/@LIBO_URE_LIB_FOLDER@ -URE_INTERNAL_JAVA_DIR=${BRAND_BASE_DIR}/@LIBO_URE_SHARE_JAVA_FOLDER@ -URE_INTERNAL_JAVA_CLASSPATH=${URE_MORE_JAVA_TYPES} -UNO_TYPES=${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES} -UNO_SERVICES=${ORIGIN}/../share/misc/services.rdb ${URE_MORE_SERVICES} |