[Libreoffice-commits] .: 5 commits - cross_toolset/prj distro-configs/LibreOfficeiOS.conf Makefile officecfg/Module_officecfg.mk sal/StaticLibrary_salcpprt.mk sc/Library_scd.mk sc/Library_scfilt.mk sc/Library_sc.mk sc/Library_vbaobj.mk solenv/gbuild starmath/Library_sm.mk vcl/AllLangResTarget_vcl.mk vcl/WinResTarget_vcl.mk
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Feb 23 13:01:15 PST 2012
Makefile | 12 +
cross_toolset/prj/build.lst | 2
distro-configs/LibreOfficeiOS.conf | 3
officecfg/Module_officecfg.mk | 10 -
sal/StaticLibrary_salcpprt.mk | 4
sc/Library_sc.mk | 82 ++++++------
sc/Library_scd.mk | 28 ++--
sc/Library_scfilt.mk | 246 ++++++++++++++++++-------------------
sc/Library_vbaobj.mk | 134 ++++++++++----------
solenv/gbuild/CppunitTest.mk | 3
starmath/Library_sm.mk | 108 ++++++++--------
vcl/AllLangResTarget_vcl.mk | 4
vcl/WinResTarget_vcl.mk | 4
13 files changed, 325 insertions(+), 315 deletions(-)
New commits:
commit 23f2719479a9eac0fde0e4cc6e4ea048886857c1
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Feb 23 22:57:59 2012 +0200
Tentatively drop gettext from cross_toolset
diff --git a/cross_toolset/prj/build.lst b/cross_toolset/prj/build.lst
index 432bbbe..0457618 100644
--- a/cross_toolset/prj/build.lst
+++ b/cross_toolset/prj/build.lst
@@ -1 +1 @@
-crs cross_toolset :: autodoc oovbaapi unodevtools gettext idl rsc setup_native icc xmlhelp shell DICTIONARIES:dictionaries NULL
+crs cross_toolset :: autodoc oovbaapi unodevtools idl rsc setup_native icc xmlhelp shell DICTIONARIES:dictionaries NULL
commit 5f9657ba54a744db564163d60e4fb3626d52f6a2
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Feb 23 22:56:00 2012 +0200
Filter out forms/util/frm component for a build without database connectivity
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index acaf76b..2f7447f 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -188,7 +188,8 @@ $(filter-out \
scripting/source/basprov/basprov \
scripting/util/scriptframe) \
$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),, \
- dbaccess/util/dba),$(1))
+ dbaccess/util/dba \
+ forms/util/frm),$(1))
endef
define gb_CppunitTest_add_components
commit 299262446f6c9d4b567f7f3db0e272d2038b5027
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Feb 23 20:25:45 2012 +0200
Make sure headers are "delivered" also for libs that are bypassed for iOS
diff --git a/Makefile b/Makefile
index 72f1174..1c72cc6 100644
--- a/Makefile
+++ b/Makefile
@@ -379,6 +379,18 @@ bootstrap: $(WORKDIR_BOOTSTRAP)
# Build
#
build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
+ifeq ($(OS),IOS)
+# We must get the headers from basic and vbahelper "delivered" because
+# as we don't link to any libs from those they won't otherwise be, or
+# something. And we still do include those headers always even if the
+# libs aren't built for iOS. (Ifdefs for iOS will be added later as
+# necessary to take care of that.)
+ $(GNUMAKE) basic vbahelper
+endif
+ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
+# Ditto for dbconnectivity in the --disable-database-connectivity case
+ cd connectivity && sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$$/\1"\2"/' <../config_host.mk >conftmp.sh && . conftmp.sh && rm conftmp.sh && $(SOLARENV)/bin/deliver.pl
+endif
cd packimages && unset MAKEFLAGS && \
$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
ifeq ($(OS_FOR_BUILD),WNT)
commit 1a39b3005d087ec8ea19fb8d9c4bb76dc50b535a
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Feb 23 18:23:00 2012 +0200
Bin obsolete options
diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf
index 24d2b54..705cb63 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -1,12 +1,10 @@
--build=i386-apple-darwin10.7.0
--host=arm-apple-darwin10
---disable-cairo
--disable-ext-pdfimport
--disable-ext-presenter-console
--disable-ext-presenter-minimizer
--disable-ext-report-builder
--disable-extension-integration
---disable-fontconfig
--disable-gconf
--disable-gnome-vfs
--disable-gstreamer
@@ -28,4 +26,3 @@
--without-junit
--without-ppds
--without-stlport
---without-system-python
commit dd3f4855ecdfe7ce765d59d3d77d754948028aa4
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Feb 23 14:41:38 2012 +0200
Unify indentation
diff --git a/officecfg/Module_officecfg.mk b/officecfg/Module_officecfg.mk
index 4a0dc8d..50eab3e 100644
--- a/officecfg/Module_officecfg.mk
+++ b/officecfg/Module_officecfg.mk
@@ -20,10 +20,10 @@
$(eval $(call gb_Module_Module,officecfg))
$(eval $(call gb_Module_add_targets,officecfg,\
- Package_cppheader \
- Package_misc \
- Package_tools \
- Configuration_officecfg \
+ Package_cppheader \
+ Package_misc \
+ Package_tools \
+ Configuration_officecfg \
))
# this does not work, subsequenttest s a runtime dep, that is it postpone the run of the unittest, not the build of it
@@ -32,7 +32,7 @@ $(eval $(call gb_Module_add_targets,officecfg,\
# disabled for now
# The cppheader test depends on comphelper so can only be a subsequentcheck:
#$(eval $(call gb_Module_add_subsequentcheck_targets,officecfg,\
-# CppunitTest_officecfg_cppheader_test \
+# CppunitTest_officecfg_cppheader_test \
#))
# vim: set noet sw=4 ts=4:
diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk
index b56d4a8..3ca32b9 100644
--- a/sal/StaticLibrary_salcpprt.mk
+++ b/sal/StaticLibrary_salcpprt.mk
@@ -28,8 +28,8 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt))
$(eval $(call gb_StaticLibrary_add_package_headers,salcpprt,\
- sal_generated \
- sal_inc \
+ sal_generated \
+ sal_inc \
))
$(eval $(call gb_StaticLibrary_add_defs,salcpprt, \
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 351386d..656aa82 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -27,17 +27,17 @@ $(eval $(call gb_Library_add_sdi_headers,sc,sc/sdi/scslots))
$(eval $(call gb_Library_set_componentfile,sc,sc/util/sc))
$(eval $(call gb_Library_set_include,sc,\
- -I$(realpath $(SRCDIR)/sc/source/core/inc) \
- -I$(realpath $(SRCDIR)/sc/source/filter/inc) \
- -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
- -I$(realpath $(SRCDIR)/sc/inc) \
- -I$(WORKDIR)/SdiTarget/sc/sdi \
- $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/sc/source/core/inc) \
+ -I$(realpath $(SRCDIR)/sc/source/filter/inc) \
+ -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
+ -I$(realpath $(SRCDIR)/sc/inc) \
+ -I$(WORKDIR)/SdiTarget/sc/sdi \
+ $$(INCLUDE) \
))
$(eval $(call gb_Library_add_defs,sc,\
- -DSC_DLLIMPLEMENTATION \
- -DSC_INFO_OSVERSION=\"$(OS)\" \
+ -DSC_DLLIMPLEMENTATION \
+ -DSC_INFO_OSVERSION=\"$(OS)\" \
))
$(eval $(call gb_Library_add_api,sc,\
@@ -46,34 +46,34 @@ $(eval $(call gb_Library_add_api,sc,\
))
$(eval $(call gb_Library_add_linked_libs,sc,\
- avmedia \
- basegfx \
- comphelper \
- cppu \
- cppuhelper \
- drawinglayer \
- editeng \
- for \
- forui \
- i18nisolang1 \
- sal \
- salhelper \
- sax \
- sb \
- sfx \
- sot \
- svl \
- svt \
- svx \
- svxcore \
- tk \
- tl \
- ucbhelper \
- utl \
- vbahelper \
- vcl \
- xo \
- $(gb_STDLIBS) \
+ avmedia \
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ drawinglayer \
+ editeng \
+ for \
+ forui \
+ i18nisolang1 \
+ sal \
+ salhelper \
+ sax \
+ sb \
+ sfx \
+ sot \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ tk \
+ tl \
+ ucbhelper \
+ utl \
+ vbahelper \
+ vcl \
+ xo \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,sc,\
@@ -119,7 +119,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/data/drawpage \
sc/source/core/data/drwlayer \
sc/source/core/data/fillinfo \
- sc/source/core/data/funcdesc \
+ sc/source/core/data/funcdesc \
sc/source/core/data/global \
sc/source/core/data/global2 \
sc/source/core/data/globalx \
@@ -418,7 +418,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/undo/undodat \
sc/source/ui/undo/undodraw \
sc/source/ui/undo/undoolk \
- sc/source/ui/undo/undorangename \
+ sc/source/ui/undo/undorangename \
sc/source/ui/undo/undostyl \
sc/source/ui/undo/undotab \
sc/source/ui/undo/undoutil \
@@ -554,9 +554,9 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
$(eval $(call gb_SdiTarget_SdiTarget,sc/sdi/scslots,sc/sdi/scalc))
$(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\
- -I$(realpath $(SRCDIR)/sc/inc) \
- -I$(realpath $(SRCDIR)/sc/sdi) \
- $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/sc/inc) \
+ -I$(realpath $(SRCDIR)/sc/sdi) \
+ $$(INCLUDE) \
))
# vim: set noet sw=4 ts=4:
diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk
index 1ccfab8..47255ea 100644
--- a/sc/Library_scd.mk
+++ b/sc/Library_scd.mk
@@ -25,8 +25,8 @@ $(eval $(call gb_Library_Library,scd))
$(eval $(call gb_Library_set_componentfile,scd,sc/util/scd))
$(eval $(call gb_Library_set_include,scd,\
- -I$(realpath $(SRCDIR)/sc/inc) \
- $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/sc/inc) \
+ $$(INCLUDE) \
))
$(eval $(call gb_Library_add_api,scd,\
@@ -35,18 +35,18 @@ $(eval $(call gb_Library_add_api,scd,\
))
$(eval $(call gb_Library_add_linked_libs,scd,\
- comphelper \
- cppu \
- cppuhelper \
- sal \
- sfx \
- sot \
- svl \
- svt \
- tl \
- ucbhelper \
- vcl \
- $(gb_STDLIBS) \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ sfx \
+ sot \
+ svl \
+ svt \
+ tl \
+ ucbhelper \
+ vcl \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,scd,\
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 53bea7a..58aea4c 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -25,11 +25,11 @@ $(eval $(call gb_Library_Library,scfilt))
$(eval $(call gb_Library_set_componentfile,scfilt,sc/util/scfilt))
$(eval $(call gb_Library_set_include,scfilt,\
- -I$(realpath $(SRCDIR)/sc/source/core/inc) \
- -I$(realpath $(SRCDIR)/sc/source/filter/inc) \
- -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
- -I$(realpath $(SRCDIR)/sc/inc) \
- $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/sc/source/core/inc) \
+ -I$(realpath $(SRCDIR)/sc/source/filter/inc) \
+ -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
+ -I$(realpath $(SRCDIR)/sc/inc) \
+ $$(INCLUDE) \
))
$(eval $(call gb_Library_add_api,scfilt,\
@@ -38,130 +38,130 @@ $(eval $(call gb_Library_add_api,scfilt,\
))
$(eval $(call gb_Library_add_linked_libs,scfilt,\
- basegfx \
- comphelper \
- cppu \
- cppuhelper \
- drawinglayer \
- editeng \
- for \
- msfilter \
- oox \
- sal \
- sax \
- sb \
- sc \
- sfx \
- sot \
- svl \
- svt \
- svx \
- svxcore \
- tk \
- tl \
- utl \
- vcl \
- $(gb_STDLIBS) \
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ drawinglayer \
+ editeng \
+ for \
+ msfilter \
+ oox \
+ sal \
+ sax \
+ sb \
+ sc \
+ sfx \
+ sot \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ tk \
+ tl \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,scfilt,\
- sc/source/filter/dif/difexp \
- sc/source/filter/dif/difimp \
- sc/source/filter/excel/colrowst \
- sc/source/filter/excel/excdoc \
- sc/source/filter/excel/excel \
- sc/source/filter/excel/excform \
- sc/source/filter/excel/excform8 \
- sc/source/filter/excel/excimp8 \
- sc/source/filter/excel/excrecds \
- sc/source/filter/excel/exctools \
- sc/source/filter/excel/expop2 \
- sc/source/filter/excel/fontbuff \
- sc/source/filter/excel/frmbase \
- sc/source/filter/excel/impop \
- sc/source/filter/excel/namebuff \
- sc/source/filter/excel/read \
- sc/source/filter/excel/tokstack \
- sc/source/filter/excel/xechart \
- sc/source/filter/excel/xecontent \
- sc/source/filter/excel/xeescher \
- sc/source/filter/excel/xeformula \
- sc/source/filter/excel/xehelper \
- sc/source/filter/excel/xelink \
- sc/source/filter/excel/xename \
- sc/source/filter/excel/xepage \
- sc/source/filter/excel/xepivot \
- sc/source/filter/excel/xerecord \
- sc/source/filter/excel/xeroot \
- sc/source/filter/excel/xestream \
- sc/source/filter/excel/xestring \
- sc/source/filter/excel/xestyle \
- sc/source/filter/excel/xetable \
- sc/source/filter/excel/xeview \
- sc/source/filter/excel/xichart \
- sc/source/filter/excel/xicontent \
- sc/source/filter/excel/xiescher \
- sc/source/filter/excel/xiformula \
- sc/source/filter/excel/xihelper \
- sc/source/filter/excel/xilink \
- sc/source/filter/excel/xiname \
- sc/source/filter/excel/xipage \
- sc/source/filter/excel/xipivot \
- sc/source/filter/excel/xiroot \
- sc/source/filter/excel/xistream \
- sc/source/filter/excel/xistring \
- sc/source/filter/excel/xistyle \
- sc/source/filter/excel/xiview \
- sc/source/filter/excel/xladdress \
- sc/source/filter/excel/xlchart \
- sc/source/filter/excel/xlescher \
- sc/source/filter/excel/xlformula \
- sc/source/filter/excel/xlpage \
- sc/source/filter/excel/xlpivot \
- sc/source/filter/excel/xlroot \
- sc/source/filter/excel/xlstyle \
- sc/source/filter/excel/xltoolbar \
- sc/source/filter/excel/xltools \
- sc/source/filter/excel/xltracer \
- sc/source/filter/excel/xlview \
- sc/source/filter/ftools/fapihelper \
- sc/source/filter/ftools/fprogressbar \
- sc/source/filter/ftools/ftools \
- sc/source/filter/html/htmlexp \
- sc/source/filter/html/htmlexp2 \
- sc/source/filter/html/htmlimp \
- sc/source/filter/html/htmlpars \
- sc/source/filter/lotus/expop \
- sc/source/filter/lotus/export \
- sc/source/filter/lotus/filter \
- sc/source/filter/lotus/lotattr \
- sc/source/filter/lotus/lotform \
- sc/source/filter/lotus/lotimpop \
- sc/source/filter/lotus/lotread \
- sc/source/filter/lotus/lotus \
- sc/source/filter/lotus/memory \
- sc/source/filter/lotus/op \
- sc/source/filter/lotus/tool \
- sc/source/filter/qpro/biff \
- sc/source/filter/qpro/qpro \
- sc/source/filter/qpro/qproform \
- sc/source/filter/qpro/qprostyle \
- sc/source/filter/rtf/eeimpars \
- sc/source/filter/rtf/expbase \
- sc/source/filter/rtf/rtfexp \
- sc/source/filter/rtf/rtfimp \
- sc/source/filter/rtf/rtfparse \
- sc/source/filter/starcalc/collect \
- sc/source/filter/starcalc/scflt \
- sc/source/filter/starcalc/scfobj \
- sc/source/filter/xcl97/XclExpChangeTrack \
- sc/source/filter/xcl97/XclImpChangeTrack \
- sc/source/filter/xcl97/xcl97esc \
- sc/source/filter/xcl97/xcl97rec \
+ sc/source/filter/dif/difexp \
+ sc/source/filter/dif/difimp \
+ sc/source/filter/excel/colrowst \
+ sc/source/filter/excel/excdoc \
+ sc/source/filter/excel/excel \
+ sc/source/filter/excel/excform \
+ sc/source/filter/excel/excform8 \
+ sc/source/filter/excel/excimp8 \
+ sc/source/filter/excel/excrecds \
+ sc/source/filter/excel/exctools \
+ sc/source/filter/excel/expop2 \
+ sc/source/filter/excel/fontbuff \
+ sc/source/filter/excel/frmbase \
+ sc/source/filter/excel/impop \
+ sc/source/filter/excel/namebuff \
+ sc/source/filter/excel/read \
+ sc/source/filter/excel/tokstack \
+ sc/source/filter/excel/xechart \
+ sc/source/filter/excel/xecontent \
+ sc/source/filter/excel/xeescher \
+ sc/source/filter/excel/xeformula \
+ sc/source/filter/excel/xehelper \
+ sc/source/filter/excel/xelink \
+ sc/source/filter/excel/xename \
+ sc/source/filter/excel/xepage \
+ sc/source/filter/excel/xepivot \
+ sc/source/filter/excel/xerecord \
+ sc/source/filter/excel/xeroot \
+ sc/source/filter/excel/xestream \
+ sc/source/filter/excel/xestring \
+ sc/source/filter/excel/xestyle \
+ sc/source/filter/excel/xetable \
+ sc/source/filter/excel/xeview \
+ sc/source/filter/excel/xichart \
+ sc/source/filter/excel/xicontent \
+ sc/source/filter/excel/xiescher \
+ sc/source/filter/excel/xiformula \
+ sc/source/filter/excel/xihelper \
+ sc/source/filter/excel/xilink \
+ sc/source/filter/excel/xiname \
+ sc/source/filter/excel/xipage \
+ sc/source/filter/excel/xipivot \
+ sc/source/filter/excel/xiroot \
+ sc/source/filter/excel/xistream \
+ sc/source/filter/excel/xistring \
+ sc/source/filter/excel/xistyle \
+ sc/source/filter/excel/xiview \
+ sc/source/filter/excel/xladdress \
+ sc/source/filter/excel/xlchart \
+ sc/source/filter/excel/xlescher \
+ sc/source/filter/excel/xlformula \
+ sc/source/filter/excel/xlpage \
+ sc/source/filter/excel/xlpivot \
+ sc/source/filter/excel/xlroot \
+ sc/source/filter/excel/xlstyle \
+ sc/source/filter/excel/xltoolbar \
+ sc/source/filter/excel/xltools \
+ sc/source/filter/excel/xltracer \
+ sc/source/filter/excel/xlview \
+ sc/source/filter/ftools/fapihelper \
+ sc/source/filter/ftools/fprogressbar \
+ sc/source/filter/ftools/ftools \
+ sc/source/filter/html/htmlexp \
+ sc/source/filter/html/htmlexp2 \
+ sc/source/filter/html/htmlimp \
+ sc/source/filter/html/htmlpars \
+ sc/source/filter/lotus/expop \
+ sc/source/filter/lotus/export \
+ sc/source/filter/lotus/filter \
+ sc/source/filter/lotus/lotattr \
+ sc/source/filter/lotus/lotform \
+ sc/source/filter/lotus/lotimpop \
+ sc/source/filter/lotus/lotread \
+ sc/source/filter/lotus/lotus \
+ sc/source/filter/lotus/memory \
+ sc/source/filter/lotus/op \
+ sc/source/filter/lotus/tool \
+ sc/source/filter/qpro/biff \
+ sc/source/filter/qpro/qpro \
+ sc/source/filter/qpro/qproform \
+ sc/source/filter/qpro/qprostyle \
+ sc/source/filter/rtf/eeimpars \
+ sc/source/filter/rtf/expbase \
+ sc/source/filter/rtf/rtfexp \
+ sc/source/filter/rtf/rtfimp \
+ sc/source/filter/rtf/rtfparse \
+ sc/source/filter/starcalc/collect \
+ sc/source/filter/starcalc/scflt \
+ sc/source/filter/starcalc/scfobj \
+ sc/source/filter/xcl97/XclExpChangeTrack \
+ sc/source/filter/xcl97/XclImpChangeTrack \
+ sc/source/filter/xcl97/xcl97esc \
+ sc/source/filter/xcl97/xcl97rec \
))
$(eval $(call gb_Library_add_noexception_objects,scfilt,\
- sc/source/filter/lotus/optab \
+ sc/source/filter/lotus/optab \
))
# vim: set noet sw=4 ts=4:
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 6a6b80d..f649a28 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -66,71 +66,71 @@ $(eval $(call gb_Library_add_linked_libs,vbaobj,\
))
$(eval $(call gb_Library_add_exception_objects,vbaobj,\
- sc/source/ui/vba/excelvbahelper \
- sc/source/ui/vba/service \
- sc/source/ui/vba/vbaapplication \
- sc/source/ui/vba/vbaassistant \
- sc/source/ui/vba/vbaaxes \
- sc/source/ui/vba/vbaaxis \
- sc/source/ui/vba/vbaaxistitle \
- sc/source/ui/vba/vbaborders \
- sc/source/ui/vba/vbacharacters \
- sc/source/ui/vba/vbachart \
- sc/source/ui/vba/vbachartobject \
- sc/source/ui/vba/vbachartobjects \
- sc/source/ui/vba/vbacharttitle \
- sc/source/ui/vba/vbacomment \
- sc/source/ui/vba/vbacomments \
- sc/source/ui/vba/vbacondition \
- sc/source/ui/vba/vbadialog \
- sc/source/ui/vba/vbadialogs \
- sc/source/ui/vba/vbaeventshelper \
- sc/source/ui/vba/vbafiledialog \
- sc/source/ui/vba/vbafiledialogselecteditems \
- sc/source/ui/vba/vbafilesearch \
- sc/source/ui/vba/vbafont \
- sc/source/ui/vba/vbaformat \
- sc/source/ui/vba/vbaformatcondition \
- sc/source/ui/vba/vbaformatconditions \
- sc/source/ui/vba/vbafoundfiles \
- sc/source/ui/vba/vbaglobals \
- sc/source/ui/vba/vbahyperlink \
- sc/source/ui/vba/vbahyperlinks \
- sc/source/ui/vba/vbainterior \
- sc/source/ui/vba/vbamenubar \
- sc/source/ui/vba/vbamenubars \
- sc/source/ui/vba/vbamenu \
- sc/source/ui/vba/vbamenus \
- sc/source/ui/vba/vbamenuitem \
- sc/source/ui/vba/vbamenuitems \
- sc/source/ui/vba/vbaname \
- sc/source/ui/vba/vbanames \
- sc/source/ui/vba/vbaoleobject \
- sc/source/ui/vba/vbaoleobjects \
- sc/source/ui/vba/vbaoutline \
- sc/source/ui/vba/vbapagebreak \
- sc/source/ui/vba/vbapagebreaks \
- sc/source/ui/vba/vbapagesetup \
- sc/source/ui/vba/vbapalette \
- sc/source/ui/vba/vbapane \
- sc/source/ui/vba/vbapivotcache \
- sc/source/ui/vba/vbapivottable \
- sc/source/ui/vba/vbapivottables \
- sc/source/ui/vba/vbaquerytable \
- sc/source/ui/vba/vbarange \
- sc/source/ui/vba/vbasheetobject \
- sc/source/ui/vba/vbastyle \
- sc/source/ui/vba/vbastyles \
- sc/source/ui/vba/vbatextboxshape \
- sc/source/ui/vba/vbatextframe \
- sc/source/ui/vba/vbavalidation \
- sc/source/ui/vba/vbawindow \
- sc/source/ui/vba/vbawindows \
- sc/source/ui/vba/vbaworkbook \
- sc/source/ui/vba/vbaworkbooks \
- sc/source/ui/vba/vbaworksheet \
- sc/source/ui/vba/vbaworksheets \
- sc/source/ui/vba/vbawsfunction \
+ sc/source/ui/vba/excelvbahelper \
+ sc/source/ui/vba/service \
+ sc/source/ui/vba/vbaapplication \
+ sc/source/ui/vba/vbaassistant \
+ sc/source/ui/vba/vbaaxes \
+ sc/source/ui/vba/vbaaxis \
+ sc/source/ui/vba/vbaaxistitle \
+ sc/source/ui/vba/vbaborders \
+ sc/source/ui/vba/vbacharacters \
+ sc/source/ui/vba/vbachart \
+ sc/source/ui/vba/vbachartobject \
+ sc/source/ui/vba/vbachartobjects \
+ sc/source/ui/vba/vbacharttitle \
+ sc/source/ui/vba/vbacomment \
+ sc/source/ui/vba/vbacomments \
+ sc/source/ui/vba/vbacondition \
+ sc/source/ui/vba/vbadialog \
+ sc/source/ui/vba/vbadialogs \
+ sc/source/ui/vba/vbaeventshelper \
+ sc/source/ui/vba/vbafiledialog \
+ sc/source/ui/vba/vbafiledialogselecteditems \
+ sc/source/ui/vba/vbafilesearch \
+ sc/source/ui/vba/vbafont \
+ sc/source/ui/vba/vbaformat \
+ sc/source/ui/vba/vbaformatcondition \
+ sc/source/ui/vba/vbaformatconditions \
+ sc/source/ui/vba/vbafoundfiles \
+ sc/source/ui/vba/vbaglobals \
+ sc/source/ui/vba/vbahyperlink \
+ sc/source/ui/vba/vbahyperlinks \
+ sc/source/ui/vba/vbainterior \
+ sc/source/ui/vba/vbamenubar \
+ sc/source/ui/vba/vbamenubars \
+ sc/source/ui/vba/vbamenu \
+ sc/source/ui/vba/vbamenus \
+ sc/source/ui/vba/vbamenuitem \
+ sc/source/ui/vba/vbamenuitems \
+ sc/source/ui/vba/vbaname \
+ sc/source/ui/vba/vbanames \
+ sc/source/ui/vba/vbaoleobject \
+ sc/source/ui/vba/vbaoleobjects \
+ sc/source/ui/vba/vbaoutline \
+ sc/source/ui/vba/vbapagebreak \
+ sc/source/ui/vba/vbapagebreaks \
+ sc/source/ui/vba/vbapagesetup \
+ sc/source/ui/vba/vbapalette \
+ sc/source/ui/vba/vbapane \
+ sc/source/ui/vba/vbapivotcache \
+ sc/source/ui/vba/vbapivottable \
+ sc/source/ui/vba/vbapivottables \
+ sc/source/ui/vba/vbaquerytable \
+ sc/source/ui/vba/vbarange \
+ sc/source/ui/vba/vbasheetobject \
+ sc/source/ui/vba/vbastyle \
+ sc/source/ui/vba/vbastyles \
+ sc/source/ui/vba/vbatextboxshape \
+ sc/source/ui/vba/vbatextframe \
+ sc/source/ui/vba/vbavalidation \
+ sc/source/ui/vba/vbawindow \
+ sc/source/ui/vba/vbawindows \
+ sc/source/ui/vba/vbaworkbook \
+ sc/source/ui/vba/vbaworkbooks \
+ sc/source/ui/vba/vbaworksheet \
+ sc/source/ui/vba/vbaworksheets \
+ sc/source/ui/vba/vbawsfunction \
))
#http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50255
@@ -140,8 +140,8 @@ endif
ifeq ($(gccthunkBroken),1)
$(eval $(call gb_Library_add_cxxobjects,vbaobj,\
- sc/source/ui/vba/vbasheetobjects \
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+ sc/source/ui/vba/vbasheetobjects \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
))
else
$(eval $(call gb_Library_add_exception_objects,vbaobj,\
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index fb35e91..b5d2ea1 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -27,9 +27,9 @@ $(eval $(call gb_Library_add_sdi_headers,sm,starmath/sdi/smslots))
$(eval $(call gb_Library_set_componentfile,sm,starmath/util/sm))
$(eval $(call gb_Library_set_include,sm,\
- -I$(realpath $(SRCDIR)/starmath/inc) \
- -I$(WORKDIR)/SdiTarget/starmath/sdi \
- $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/starmath/inc) \
+ -I$(WORKDIR)/SdiTarget/starmath/sdi \
+ $$(INCLUDE) \
))
$(eval $(call gb_Library_add_api,sm,\
@@ -38,69 +38,69 @@ $(eval $(call gb_Library_add_api,sm,\
))
$(eval $(call gb_Library_add_linked_libs,sm,\
- comphelper \
- cppu \
- cppuhelper \
- editeng \
+ comphelper \
+ cppu \
+ cppuhelper \
+ editeng \
i18npaper \
- msfilter \
- oox \
- sal \
- sax \
- sfx \
- sot \
- svl \
- svt \
- svx \
- svxcore \
- tk \
- tl \
- utl \
- vcl \
+ msfilter \
+ oox \
+ sal \
+ sax \
+ sfx \
+ sot \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ tk \
+ tl \
+ utl \
+ vcl \
xo \
$(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,sm,\
- starmath/source/accessibility \
- starmath/source/action \
- starmath/source/caret \
- starmath/source/cfgitem \
- starmath/source/config \
- starmath/source/cursor \
- starmath/source/dialog \
- starmath/source/document \
- starmath/source/edit \
- starmath/source/format \
- starmath/source/mathmlexport \
- starmath/source/mathmlimport \
- starmath/source/mathtype \
- starmath/source/node \
- starmath/source/ooxmlexport \
- starmath/source/ooxmlimport \
- starmath/source/parse \
- starmath/source/rect \
- starmath/source/register \
- starmath/source/smdll \
- starmath/source/smmod \
- starmath/source/symbol \
- starmath/source/toolbox \
- starmath/source/typemap \
- starmath/source/types \
- starmath/source/unodoc \
- starmath/source/unomodel \
- starmath/source/utility \
- starmath/source/view \
- starmath/source/visitors \
+ starmath/source/accessibility \
+ starmath/source/action \
+ starmath/source/caret \
+ starmath/source/cfgitem \
+ starmath/source/config \
+ starmath/source/cursor \
+ starmath/source/dialog \
+ starmath/source/document \
+ starmath/source/edit \
+ starmath/source/format \
+ starmath/source/mathmlexport \
+ starmath/source/mathmlimport \
+ starmath/source/mathtype \
+ starmath/source/node \
+ starmath/source/ooxmlexport \
+ starmath/source/ooxmlimport \
+ starmath/source/parse \
+ starmath/source/rect \
+ starmath/source/register \
+ starmath/source/smdll \
+ starmath/source/smmod \
+ starmath/source/symbol \
+ starmath/source/toolbox \
+ starmath/source/typemap \
+ starmath/source/types \
+ starmath/source/unodoc \
+ starmath/source/unomodel \
+ starmath/source/utility \
+ starmath/source/view \
+ starmath/source/visitors \
))
$(eval $(call gb_SdiTarget_SdiTarget,starmath/sdi/smslots,starmath/sdi/smath))
$(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\
- -I$(realpath $(SRCDIR)/starmath/inc) \
- -I$(realpath $(SRCDIR)/starmath/sdi) \
- $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/starmath/inc) \
+ -I$(realpath $(SRCDIR)/starmath/sdi) \
+ $$(INCLUDE) \
))
# vim: set noet sw=4 ts=4:
diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk
index 7534c26..c9e2ba3 100644
--- a/vcl/AllLangResTarget_vcl.mk
+++ b/vcl/AllLangResTarget_vcl.mk
@@ -37,8 +37,8 @@ $(eval $(call gb_AllLangResTarget_add_srs,vcl,\
$(eval $(call gb_SrsTarget_SrsTarget,vcl/source/src))
$(eval $(call gb_SrsTarget_set_include,vcl/source/src,\
- $$(INCLUDE) \
- -I$(realpath $(SRCDIR)/vcl/inc) \
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/vcl/inc) \
))
$(eval $(call gb_SrsTarget_add_files,vcl/source/src,\
diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk
index b6a0ca0..afd7916 100644
--- a/vcl/WinResTarget_vcl.mk
+++ b/vcl/WinResTarget_vcl.mk
@@ -29,8 +29,8 @@
$(eval $(call gb_WinResTarget_WinResTarget,vcl/src))
$(eval $(call gb_WinResTarget_set_include,vcl/src,\
- $$(INCLUDE) \
- -I$(realpath $(SRCDIR)/vcl/inc) \
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/vcl/inc) \
))
$(eval $(call gb_WinResTarget_add_file,vcl/src,\
More information about the Libreoffice-commits
mailing list