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

Stephan Bergmann sbergman at redhat.com
Mon Mar 16 06:26:59 PDT 2015


 postprocess/Rdb_services.mk |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 1f61e1378d45f27df22e0380038a25bf86926c48
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Mar 16 14:24:45 2015 +0100

    Exclude Python components if --disable-python
    
    Change-Id: I05c1e9d7b270bcafa7fbfe526c8b12733d8ed708

diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index affb629..9b398cf 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -168,16 +168,18 @@ $(eval $(call gb_Rdb_add_components,services,\
 		scripting/source/basprov/basprov \
 		scripting/source/dlgprov/dlgprov \
 		scripting/source/protocolhandler/protocolhandler \
-		scripting/source/pyprov/mailmerge \
-		wizards/com/sun/star/wizards/fax/fax \
-		wizards/com/sun/star/wizards/letter/letter \
-		wizards/com/sun/star/wizards/agenda/agenda \
-		wizards/com/sun/star/wizards/web/web \
 		scripting/source/stringresource/stringresource \
 		scripting/source/vbaevents/vbaevents \
 		scripting/util/scriptframe \
 		sw/util/vbaswobj \
 		vbahelper/util/msforms \
+		$(ifneq ($(DISABLE_PYTHON),TRUE) \
+			scripting/source/pyprov/mailmerge \
+			wizards/com/sun/star/wizards/agenda/agenda \
+			wizards/com/sun/star/wizards/fax/fax \
+			wizards/com/sun/star/wizards/letter/letter \
+			wizards/com/sun/star/wizards/web/web \
+		) \
 	) \
 	$(if $(ENABLE_CAIRO_CANVAS), \
 		canvas/source/cairo/cairocanvas \


More information about the Libreoffice-commits mailing list