From 42c9f35da2c2479113ae7dab8426d2d18986aca7 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Mon, 3 Mar 2014 22:39:09 +0100
Subject: [PATCH] shell: get rid of separate Library_syssh_win.mk

Change-Id: I12f38bab6ea7207b79994556f0ab6798d2d1d9da
---
 shell/Library_syssh.mk     | 22 ++++++++++++++++++++--
 shell/Library_syssh_win.mk | 33 ---------------------------------
 shell/Module_shell.mk      |  3 +--
 3 files changed, 21 insertions(+), 37 deletions(-)
 delete mode 100644 shell/Library_syssh_win.mk

diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk
index ddd268285b05..17ee516c5b77 100644
--- a/shell/Library_syssh.mk
+++ b/shell/Library_syssh.mk
@@ -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:
diff --git a/shell/Library_syssh_win.mk b/shell/Library_syssh_win.mk
deleted file mode 100644
index 016bf1b8d157..000000000000
--- a/shell/Library_syssh_win.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_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:
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 34613811244e..3b84d24a4bbc 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -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 \