[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk postprocess/Rdb_services.mk

Tor Lillqvist tml at iki.fi
Wed Aug 21 23:54:12 PDT 2013


 postprocess/CustomTarget_registry.mk |    2 ++
 postprocess/Rdb_services.mk          |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 8bafd5471ed2e85a82f412a742feae76b2fd7d70
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Aug 22 09:52:49 2013 +0300

    mork and mozab only on DESKTOP
    
    Change-Id: Idf8539992cbc52e848c2e7768551c156764b5cea

diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 10af27b..8b9dd00 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -288,10 +288,12 @@ postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Dr
 postprocess_DRIVERS += mozab
 endif
 else ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
 postprocess_DRIVERS += mork
 endif
 endif
+endif
 ifeq (MACOSX,$(OS))
 postprocess_FILES_main += \
 	$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-macab.xcu \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 6f14a88..adf3837 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -294,10 +294,12 @@ endif
 
 else
 
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Rdb_add_components,services,\
 	connectivity/source/drivers/mork/mork \
 	connectivity/source/drivers/mozab/bootstrap/mozbootstrap \
 ))
+endif # DESKTOP
 
 endif # WNT
 


More information about the Libreoffice-commits mailing list