strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shell: get rid of separate Library_syssh_win.mk

Browse source 
Change-Id: I12f38bab6ea7207b79994556f0ab6798d2d1d9da
This commit is contained in:
Michael Stahl 2014-03-03 22:39:09 +01:00
parent d49543cefb
commit 42c9f35da2
3 changed files with 21 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
shell/Library_syssh.mk
View file

@ -18,6 +18,22 @@ $(eval $(call gb_Library_use_libraries,syssh,\
$(gb_UWINAPI) \
))
ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,syssh,\
ole32 \
shell32 \
))
$(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh))
$(eval $(call gb_Library_add_exception_objects,syssh,\
shell/source/win32/SysShExec \
shell/source/win32/SysShentry \
))
else # OS != WNT
$(eval $(call gb_Library_use_static_libraries,syssh,\
shell_xmlparser \
))
@ -25,8 +41,10 @@ $(eval $(call gb_Library_use_static_libraries,syssh,\
$(eval $(call gb_Library_set_componentfile,syssh,shell/source/unix/exec/syssh))
$(eval $(call gb_Library_add_exception_objects,syssh,\
shell/source/unix/exec/shellexec \
shell/source/unix/exec/shellexecentry \
shell/source/unix/exec/shellexec \
shell/source/unix/exec/shellexecentry \
))
endif # OS
# vim: set shiftwidth=4 tabstop=4 noexpandtab:

33
shell/Library_syssh_win.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_Library_Library,syssh))
$(eval $(call gb_Library_use_sdk_api,syssh))
$(eval $(call gb_Library_use_libraries,syssh,\
cppu \
cppuhelper \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_use_system_win32_libs,syssh,\
ole32 \
shell32 \
))
$(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh))
$(eval $(call gb_Library_add_exception_objects,syssh,\
shell/source/win32/SysShExec \
shell/source/win32/SysShentry \
))
# vim: set shiftwidth=4 tabstop=4 noexpandtab:

3
shell/Module_shell.mk
View file

@ -57,7 +57,6 @@ $(eval $(call gb_Module_add_targets,shell,\
Executable_regsvrex \
Executable_senddoc \
Library_smplmail \
Library_syssh_win \
Library_wininetbe \
StaticLibrary_simplemapi \
))
@ -101,6 +100,7 @@ ifeq ($(filter DESKTOP,$(BUILD_TYPE)),DESKTOP)
$(eval $(call gb_Module_add_targets,shell,\
Executable_lngconvex \
Library_syssh \
))
ifneq ($(OS),WNT)
@ -109,7 +109,6 @@ $(eval $(call gb_Module_add_targets,shell,\
Executable_gnome_open_url \
Executable_uri_encode \
Library_cmdmail \
Library_syssh \
Package_scripts \
Package_scripts_gnome \
Package_scripts_kde \