[Libreoffice-commits] .: 2 commits - registry/Library_reg.mk registry/Module_registry.mk

[Tor Lillqvist]

 registry/Library_reg.mk     |    1 +
 registry/Module_registry.mk |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit dd3124dfa4cdab080943127dde53ca2130ecf602
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon May 7 10:58:42 2012 +0300

    Don't bother with the static lib and the exes for non-desktop OSes
    
    Change-Id: Ia559990745d10c2f128624b6ffe76ece8a9151b9

diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk
index 0867564..c62ece0 100644
--- a/registry/Module_registry.mk
+++ b/registry/Module_registry.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Module_add_targets,registry,\
     Package_inc \
 ))
 
-ifneq ($(OS),IOS)
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 
 $(eval $(call gb_Module_add_targets,registry,\
     StaticLibrary_registry_helper \
commit c8155a58bd1370d2375bdc7f08ae7cd40282b1ec
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon May 7 10:57:18 2012 +0300

    Use gb_STDLIBS
    
    Change-Id: I6fcbe4db269472543e8b3310c966a68f5846a510

diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk
index 0ee4ccd..4dd10b7 100644
--- a/registry/Library_reg.mk
+++ b/registry/Library_reg.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_defs,reg,\
 $(eval $(call gb_Library_use_libraries,reg,\
 	sal \
 	store \
+	$(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,reg,\