[Libreoffice-commits] .: 3 commits - desktop/Library_sofficeapp.mk desktop/Module_desktop.mk sal/osl

[Tor Lillqvist]

 desktop/Library_sofficeapp.mk |    8 ++++----
 desktop/Module_desktop.mk     |   23 ++++++++++++++---------
 sal/osl/unx/module.c          |    1 +
 3 files changed, 19 insertions(+), 13 deletions(-)

New commits:
commit 530a76c8effedc921cbf70293b6730620ec2fef2
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Nov 16 11:06:57 2011 +0200

    Reduce what we build here for non-DESKTOP OSes

diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 2b137f6..b9cc758 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -39,6 +39,19 @@ $(eval $(call gb_Module_add_targets,desktop,\
     AllLangResTarget_deployment \
     AllLangResTarget_deploymentgui \
     AllLangResTarget_dkt \
+    Library_offacc \
+    Library_sofficeapp \
+    Library_spl \
+    Library_unopkgapp \
+    Package_branding \
+    Package_intro \
+    Zip_brand \
+    Zip_brand_dev \
+    Zip_shell \
+))
+
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+$(eval $(call gb_Module_add_targets,desktop,\
     Executable_soffice.bin \
     Executable_unopkg.bin \
     Library_deployment \
@@ -46,22 +59,14 @@ $(eval $(call gb_Module_add_targets,desktop,\
     Library_deploymentmisc \
     Library_migrationoo2 \
     Library_migrationoo3 \
-    Library_offacc \
-    Library_sofficeapp \
-    Library_spl \
-    Library_unopkgapp \
-    Package_branding \
-    Package_intro \
     Package_scripts \
     Pagein_calc \
     Pagein_common \
     Pagein_draw \
     Pagein_impress \
     Pagein_writer \
-    Zip_brand \
-    Zip_brand_dev \
-    Zip_shell \
 ))
+endif
 
 ifeq ($(OS),WNT)
 
commit 44329b4cacdb73a1977645e974bc009680b1b9c3
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Nov 16 10:50:36 2011 +0200

    What we want is the "filter" function, not "firstword"

diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index f9e9839..15ac285 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -41,10 +41,10 @@ $(eval $(call gb_Library_add_api,sofficeapp,\
 
 $(eval $(call gb_Library_add_defs,sofficeapp,\
     -DDESKTOP_DLLIMPLEMENTATION \
-    $(if $(firstword TRUE,$(ENABLE_GNOMEVFS)),-DGNOME_VFS_ENABLED) \
-    $(if $(firstword WNT,$(GUI)),-DENABLE_QUICKSTART_APPLET) \
-    $(if $(firstword aqua,$(GUIBASE)),-DENABLE_QUICKSTART_APPLET) \
-    $(if $(firstword TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \
+    $(if $(filter TRUE,$(ENABLE_GNOMEVFS)),-DGNOME_VFS_ENABLED) \
+    $(if $(filter WNT,$(GUI)),-DENABLE_QUICKSTART_APPLET) \
+    $(if $(filter aqua,$(GUIBASE)),-DENABLE_QUICKSTART_APPLET) \
+    $(if $(filter TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \
 ))
 
 $(eval $(call gb_Library_set_include,sofficeapp,\
commit ec64673e61fabc80ec5e4fa60d78d33bf537eb4f
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Nov 16 10:02:59 2011 +0200

    WaE: Unused parameter

diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
index c0ee837..824a629 100644
--- a/sal/osl/unx/module.c
+++ b/sal/osl/unx/module.c
@@ -151,6 +151,7 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nR
 #ifdef ANDROID
         void *(*lo_dlopen)(const char *) = dlsym(RTLD_DEFAULT, "lo_dlopen");
         void *pLib;
+        (void) nRtldMode;
         OSL_ASSERT(lo_dlopen != NULL);
         pLib = (*lo_dlopen)(pModuleName);
 #else