mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

desktop: need only one Package_scripts

Browse Source 
Change-Id: Ia47d1cc8c2d754f74e281eac82c76fbaf12d8541
This commit is contained in:
Michael Stahl
2013-10-24 15:38:44 +02:00
parent 3f8ded9c5c
commit cacce520c6
3 changed files with 13 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
desktop/Module_desktop.mk
View File

@@ -40,7 +40,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
Library_migrationoo3 \
Library_unopkgapp \
Package_scripts \
Package_scripts_install \
Pagein_calc \
Pagein_common \
Pagein_draw \

24
desktop/Package_scripts.mk
View File

@@ -7,25 +7,27 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Package_Package,desktop_scripts,$(SRCDIR)/desktop/scripts))
$(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scripts))
$(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTROOT)))
ifeq (,$(filter MACOSX WNT,$(OS)))
$(eval $(call gb_Package_add_file,desktop_scripts,bin/gdbtrace,gdbtrace))
$(eval $(call gb_Package_add_file,desktop_scripts,bin/sbase,sbase.sh))
$(eval $(call gb_Package_add_file,desktop_scripts,bin/scalc,scalc.sh))
$(eval $(call gb_Package_add_file,desktop_scripts,bin/sdraw,sdraw.sh))
$(eval $(call gb_Package_add_file,desktop_scripts,bin/simpress,simpress.sh))
$(eval $(call gb_Package_add_file,desktop_scripts,bin/smath,smath.sh))
$(eval $(call gb_Package_add_file,desktop_scripts,bin/swriter,swriter.sh))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/gdbtrace,gdbtrace))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sbase,sbase.sh))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/scalc,scalc.sh))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sdraw,sdraw.sh))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/simpress,simpress.sh))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/smath,smath.sh))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/swriter,swriter.sh))
endif
ifneq ($(OS),WNT)
$(eval $(call gb_Package_add_file,desktop_scripts,bin/unoinfo,unoinfo.sh))
$(eval $(call gb_Package_add_file,desktop_scripts,bin/unopkg,unopkg.sh))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unoinfo,unoinfo.sh))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh))
endif
# vim: set ts=4 sw=4 et:
# vim: set ts=4 sw=4 noet:

33
desktop/Package_scripts_install.mk
View File

@@ -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,desktop_scripts_install,$(SRCDIR)/desktop/scripts))
$(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTROOT)))
ifeq (,$(filter MACOSX WNT,$(OS)))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/gdbtrace,gdbtrace))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sbase,sbase.sh))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/scalc,scalc.sh))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sdraw,sdraw.sh))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/simpress,simpress.sh))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/smath,smath.sh))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/swriter,swriter.sh))
endif
ifneq ($(OS),WNT)
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unoinfo,unoinfo.sh))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh))
endif
# vim: set ts=4 sw=4 noet: