[Libreoffice-commits] core.git: shell/Module_shell.mk

[Tor Lillqvist]

 shell/Module_shell.mk |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit ee39446353a7fd6ba28b6fcf915bc6c020f3bda6
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Mar 7 10:08:08 2014 +0200

    Why would we need GNOME and KDE scripts on OS X?
    
    Also, the senddoc script seems fairly AIX/Linux/X11-specific.
    
    Change-Id: I06c417df3256204d2b8b29b3978f89b00c15f6f0

diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 3b84d24..78b481c 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -101,9 +101,10 @@ ifeq ($(filter DESKTOP,$(BUILD_TYPE)),DESKTOP)
 $(eval $(call gb_Module_add_targets,shell,\
 	Executable_lngconvex \
 	Library_syssh \
+	StaticLibrary_xmlparser \
 ))
 
-ifneq ($(OS),WNT)
+ifneq ($(filter-out MACOSX WNT,$(OS)),)
 
 $(eval $(call gb_Module_add_targets,shell,\
 	Executable_gnome_open_url \
@@ -113,14 +114,11 @@ $(eval $(call gb_Module_add_targets,shell,\
 	Package_scripts_gnome \
 	Package_scripts_kde \
 	Package_senddoc \
-	StaticLibrary_xmlparser \
 ))
 
-ifneq ($(filter-out MACOSX IOS ANDROID,$(OS)),)
 $(eval $(call gb_Module_add_targets,shell,\
 	Library_recentfile \
 ))
-endif
 
 endif