diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-19 13:52:44 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:09:10 +0200 |
| commit | d44759e3d78d23b360f8b628857a96618dae5cbd (patch) | |
| tree | e35beb804e06c9e54d441b85f6fb97e2da98f936 /instsetoo_native | |
| parent | d78e4f0c461d80c17aa813c7ee6c04b5cee881b0 (diff) | |
gbuild: install rdb files directly in module they come from
Change-Id: I3a9cb4ce71cfb02b7378289a36aa0eb6e3a42f26
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/Module_instsetoo_native.mk | 1 | ||||
| -rw-r--r-- | instsetoo_native/Package_rdb.mk | 33 |
2 files changed, 0 insertions, 34 deletions
diff --git a/instsetoo_native/Module_instsetoo_native.mk b/instsetoo_native/Module_instsetoo_native.mk index 7c098d3dfe5e..49bcb128d31d 100644 --- a/instsetoo_native/Module_instsetoo_native.mk +++ b/instsetoo_native/Module_instsetoo_native.mk @@ -21,7 +21,6 @@ ifneq ($(gb_RUNNABLE_INSTDIR),) $(eval $(call gb_Module_add_targets,instsetoo_native,\ CustomTarget_setup \ Package_config \ - Package_rdb \ Package_setup \ )) endif diff --git a/instsetoo_native/Package_rdb.mk b/instsetoo_native/Package_rdb.mk deleted file mode 100644 index 308bb460c801..000000000000 --- a/instsetoo_native/Package_rdb.mk +++ /dev/null @@ -1,33 +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,instsetoo_native_rdb,$(OUTDIR))) - -$(eval $(call gb_Package_set_outdir,instsetoo_native_rdb,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,instsetoo_native_rdb,$(gb_PROGRAMDIRNAME)/services,\ - xml/services.rdb \ - $(call gb_Helper_optional,POSTGRESQL,$(if $(filter YES,$(BUILD_POSTGRESQL_SDBC)),xml/postgresql-sdbc.rdb)) \ - $(if $(filter TRUE,$(DISABLE_SCRIPTING)),,\ - $(if $(ENABLE_JAVA),\ - $(if $(ENABLE_SCRIPTING_BEANSHELL),xml/scriptproviderforbeanshell.rdb) \ - $(if $(ENABLE_SCRIPTING_JAVASCRIPT),xml/scriptproviderforjavascript.rdb) \ - ) \ - ) \ -)) - -$(eval $(call gb_Package_add_files,instsetoo_native_rdb,$(gb_PROGRAMDIRNAME)/types,\ - bin/offapi.rdb \ - bin/oovbaapi.rdb \ -)) - -$(eval $(call gb_Package_add_file,instsetoo_native_rdb,ure/share/misc/services.rdb,xml/ure/services.rdb)) -$(eval $(call gb_Package_add_file,instsetoo_native_rdb,ure/share/misc/types.rdb,bin/udkapi.rdb)) - -# vim: set noet sw=4 ts=4: |