[Libreoffice-commits] .: 2 commits - autodoc/Module_autodoc.mk svx/Library_svxcore.mk svx/Library_svx.mk

[Tor Lillqvist]

 autodoc/Module_autodoc.mk |    4 ++++
 svx/Library_svx.mk        |    2 +-
 svx/Library_svxcore.mk    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 323f755ddd1ac0709aae468a6670b1803e70c446
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Aug 2 19:51:06 2012 +0300

    Do bypass form stuff for iOS too
    
    Change-Id: I6238f88054f3d344fc616bc90e291a7367f16808

diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 0a65c1d..a26c1c3 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -200,7 +200,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
     svx/source/unogallery/unogalthemeprovider \
 ))
 
-ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))$(filter IOS,$(OS)))
+ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
 $(eval $(call gb_Library_add_exception_objects,svx,\
     svx/source/fmcomp/dbaobjectex \
     svx/source/form/databaselocationinput \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 5a54b64..5ee3309 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -379,7 +379,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
     svx/source/xoutdev/xtablend \
 ))
 
-ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))$(filter IOS,$(OS)))
+ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
 $(eval $(call gb_Library_use_packages,svxcore,\
 	connectivity_inc \
 	connectivity_generated \
commit 6e495b9b8ab931a970127882530946ed9ba3dfd9
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Aug 2 19:31:22 2012 +0300

    Build autodoc only for desktop OSes
    
    Change-Id: I43ae61bd090139e53218608816253c15542b1ceb

diff --git a/autodoc/Module_autodoc.mk b/autodoc/Module_autodoc.mk
index 5994a44..d10c946 100644
--- a/autodoc/Module_autodoc.mk
+++ b/autodoc/Module_autodoc.mk
@@ -8,8 +8,12 @@
 #
 $(eval $(call gb_Module_Module,autodoc))
 
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+
 $(eval $(call gb_Module_add_targets,autodoc,\
     Executable_autodoc \
 ))
 
+endif
+
 # vim:set shiftwidth=4 softtabstop=4 expandtab: