[Libreoffice-commits] .: postprocess/packcomponents

[Tor Lillqvist]

 postprocess/packcomponents/makefile.mk |   30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

New commits:
commit 5a388e5c2edb99c192e58d95f70341ec1de08f38
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jan 30 09:29:26 2012 +0200

    For iOS, skip stuff not built

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 94923a3..e0b37df 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -35,8 +35,6 @@ my_components = \
     calc \
     component/animations/source/animcore/animcore \
     component/avmedia/util/avmedia \
-    component/basctl/util/basctl \
-    component/basic/util/sb \
     component/chart2/source/controller/chartcontroller \
     component/chart2/source/model/chartmodel \
     component/chart2/source/tools/charttools \
@@ -93,17 +91,9 @@ my_components = \
     component/sc/util/sc \
     component/sc/util/scd \
     component/sc/util/scfilt \
-    component/sc/util/vbaobj \
     component/scaddins/source/analysis/analysis \
     component/scaddins/source/datefunc/date \
     component/sccomp/source/solver/solver \
-    component/scripting/source/basprov/basprov \
-    component/scripting/source/dlgprov/dlgprov \
-    component/scripting/source/protocolhandler/protocolhandler \
-    component/scripting/source/pyprov/mailmerge \
-    component/scripting/source/stringresource/stringresource \
-    component/scripting/source/vbaevents/vbaevents \
-    component/scripting/util/scriptframe \
     component/sd/util/sd \
     component/sd/util/sdd \
     component/sd/util/sdfilt \
@@ -123,7 +113,6 @@ my_components = \
     component/sw/util/msword \
     component/sw/util/sw \
     component/sw/util/swd \
-    component/sw/util/vbaswobj \
     component/toolkit/util/tk \
     component/ucb/source/sorter/srtrs1 \
     component/ucb/source/core/ucb1 \
@@ -141,7 +130,6 @@ my_components = \
     component/unoxml/source/rdf/unordf \
     component/unoxml/source/service/unoxml \
     component/uui/util/uui \
-    component/vbahelper/util/msforms \
     component/writerfilter/util/writerfilter \
     component/writerperfect/util/msworksfilter \
     component/writerperfect/util/visiofilter \
@@ -189,6 +177,24 @@ my_components += \
 
 .ENDIF
 
+.IF "$(OS)" != "IOS"
+
+my_components += \
+    component/basctl/util/basctl \
+    component/basic/util/sb \
+    component/sc/util/vbaobj \
+    component/scripting/source/basprov/basprov \
+    component/scripting/source/dlgprov/dlgprov \
+    component/scripting/source/protocolhandler/protocolhandler \
+    component/scripting/source/pyprov/mailmerge \
+    component/scripting/source/stringresource/stringresource \
+    component/scripting/source/vbaevents/vbaevents \
+    component/scripting/util/scriptframe \
+    component/sw/util/vbaswobj \
+    component/vbahelper/util/msforms
+
+.ENDIF
+
 .IF "$(DISABLE_PYTHON)" != "TRUE"
 my_components += pythonloader
 .ENDIF