Kaydet (Commit) dd3f4855 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Unify indentation

üst 0a45b102
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
$(eval $(call gb_Module_Module,officecfg)) $(eval $(call gb_Module_Module,officecfg))
$(eval $(call gb_Module_add_targets,officecfg,\ $(eval $(call gb_Module_add_targets,officecfg,\
Package_cppheader \ Package_cppheader \
Package_misc \ Package_misc \
Package_tools \ Package_tools \
Configuration_officecfg \ 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 # 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,\ ...@@ -32,7 +32,7 @@ $(eval $(call gb_Module_add_targets,officecfg,\
# disabled for now # disabled for now
# The cppheader test depends on comphelper so can only be a subsequentcheck: # The cppheader test depends on comphelper so can only be a subsequentcheck:
#$(eval $(call gb_Module_add_subsequentcheck_targets,officecfg,\ #$(eval $(call gb_Module_add_subsequentcheck_targets,officecfg,\
# CppunitTest_officecfg_cppheader_test \ # CppunitTest_officecfg_cppheader_test \
#)) #))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt)) $(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt))
$(eval $(call gb_StaticLibrary_add_package_headers,salcpprt,\ $(eval $(call gb_StaticLibrary_add_package_headers,salcpprt,\
sal_generated \ sal_generated \
sal_inc \ sal_inc \
)) ))
$(eval $(call gb_StaticLibrary_add_defs,salcpprt, \ $(eval $(call gb_StaticLibrary_add_defs,salcpprt, \
......
...@@ -27,17 +27,17 @@ $(eval $(call gb_Library_add_sdi_headers,sc,sc/sdi/scslots)) ...@@ -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_componentfile,sc,sc/util/sc))
$(eval $(call gb_Library_set_include,sc,\ $(eval $(call gb_Library_set_include,sc,\
-I$(realpath $(SRCDIR)/sc/source/core/inc) \ -I$(realpath $(SRCDIR)/sc/source/core/inc) \
-I$(realpath $(SRCDIR)/sc/source/filter/inc) \ -I$(realpath $(SRCDIR)/sc/source/filter/inc) \
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \ -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \ -I$(realpath $(SRCDIR)/sc/inc) \
-I$(WORKDIR)/SdiTarget/sc/sdi \ -I$(WORKDIR)/SdiTarget/sc/sdi \
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
$(eval $(call gb_Library_add_defs,sc,\ $(eval $(call gb_Library_add_defs,sc,\
-DSC_DLLIMPLEMENTATION \ -DSC_DLLIMPLEMENTATION \
-DSC_INFO_OSVERSION=\"$(OS)\" \ -DSC_INFO_OSVERSION=\"$(OS)\" \
)) ))
$(eval $(call gb_Library_add_api,sc,\ $(eval $(call gb_Library_add_api,sc,\
...@@ -46,34 +46,34 @@ $(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,\ $(eval $(call gb_Library_add_linked_libs,sc,\
avmedia \ avmedia \
basegfx \ basegfx \
comphelper \ comphelper \
cppu \ cppu \
cppuhelper \ cppuhelper \
drawinglayer \ drawinglayer \
editeng \ editeng \
for \ for \
forui \ forui \
i18nisolang1 \ i18nisolang1 \
sal \ sal \
salhelper \ salhelper \
sax \ sax \
sb \ sb \
sfx \ sfx \
sot \ sot \
svl \ svl \
svt \ svt \
svx \ svx \
svxcore \ svxcore \
tk \ tk \
tl \ tl \
ucbhelper \ ucbhelper \
utl \ utl \
vbahelper \ vbahelper \
vcl \ vcl \
xo \ xo \
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(eval $(call gb_Library_add_exception_objects,sc,\ $(eval $(call gb_Library_add_exception_objects,sc,\
...@@ -119,7 +119,7 @@ $(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/drawpage \
sc/source/core/data/drwlayer \ sc/source/core/data/drwlayer \
sc/source/core/data/fillinfo \ sc/source/core/data/fillinfo \
sc/source/core/data/funcdesc \ sc/source/core/data/funcdesc \
sc/source/core/data/global \ sc/source/core/data/global \
sc/source/core/data/global2 \ sc/source/core/data/global2 \
sc/source/core/data/globalx \ sc/source/core/data/globalx \
...@@ -418,7 +418,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ ...@@ -418,7 +418,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/undo/undodat \ sc/source/ui/undo/undodat \
sc/source/ui/undo/undodraw \ sc/source/ui/undo/undodraw \
sc/source/ui/undo/undoolk \ sc/source/ui/undo/undoolk \
sc/source/ui/undo/undorangename \ sc/source/ui/undo/undorangename \
sc/source/ui/undo/undostyl \ sc/source/ui/undo/undostyl \
sc/source/ui/undo/undotab \ sc/source/ui/undo/undotab \
sc/source/ui/undo/undoutil \ sc/source/ui/undo/undoutil \
...@@ -554,9 +554,9 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ ...@@ -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_SdiTarget,sc/sdi/scslots,sc/sdi/scalc))
$(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\ $(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\
-I$(realpath $(SRCDIR)/sc/inc) \ -I$(realpath $(SRCDIR)/sc/inc) \
-I$(realpath $(SRCDIR)/sc/sdi) \ -I$(realpath $(SRCDIR)/sc/sdi) \
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -25,8 +25,8 @@ $(eval $(call gb_Library_Library,scd)) ...@@ -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_componentfile,scd,sc/util/scd))
$(eval $(call gb_Library_set_include,scd,\ $(eval $(call gb_Library_set_include,scd,\
-I$(realpath $(SRCDIR)/sc/inc) \ -I$(realpath $(SRCDIR)/sc/inc) \
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
$(eval $(call gb_Library_add_api,scd,\ $(eval $(call gb_Library_add_api,scd,\
...@@ -35,18 +35,18 @@ $(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,\ $(eval $(call gb_Library_add_linked_libs,scd,\
comphelper \ comphelper \
cppu \ cppu \
cppuhelper \ cppuhelper \
sal \ sal \
sfx \ sfx \
sot \ sot \
svl \ svl \
svt \ svt \
tl \ tl \
ucbhelper \ ucbhelper \
vcl \ vcl \
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(eval $(call gb_Library_add_exception_objects,scd,\ $(eval $(call gb_Library_add_exception_objects,scd,\
......
...@@ -25,11 +25,11 @@ $(eval $(call gb_Library_Library,scfilt)) ...@@ -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_componentfile,scfilt,sc/util/scfilt))
$(eval $(call gb_Library_set_include,scfilt,\ $(eval $(call gb_Library_set_include,scfilt,\
-I$(realpath $(SRCDIR)/sc/source/core/inc) \ -I$(realpath $(SRCDIR)/sc/source/core/inc) \
-I$(realpath $(SRCDIR)/sc/source/filter/inc) \ -I$(realpath $(SRCDIR)/sc/source/filter/inc) \
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \ -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \ -I$(realpath $(SRCDIR)/sc/inc) \
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
$(eval $(call gb_Library_add_api,scfilt,\ $(eval $(call gb_Library_add_api,scfilt,\
...@@ -38,130 +38,130 @@ $(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,\ $(eval $(call gb_Library_add_linked_libs,scfilt,\
basegfx \ basegfx \
comphelper \ comphelper \
cppu \ cppu \
cppuhelper \ cppuhelper \
drawinglayer \ drawinglayer \
editeng \ editeng \
for \ for \
msfilter \ msfilter \
oox \ oox \
sal \ sal \
sax \ sax \
sb \ sb \
sc \ sc \
sfx \ sfx \
sot \ sot \
svl \ svl \
svt \ svt \
svx \ svx \
svxcore \ svxcore \
tk \ tk \
tl \ tl \
utl \ utl \
vcl \ vcl \
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(eval $(call gb_Library_add_exception_objects,scfilt,\ $(eval $(call gb_Library_add_exception_objects,scfilt,\
sc/source/filter/dif/difexp \ sc/source/filter/dif/difexp \
sc/source/filter/dif/difimp \ sc/source/filter/dif/difimp \
sc/source/filter/excel/colrowst \ sc/source/filter/excel/colrowst \
sc/source/filter/excel/excdoc \ sc/source/filter/excel/excdoc \
sc/source/filter/excel/excel \ sc/source/filter/excel/excel \
sc/source/filter/excel/excform \ sc/source/filter/excel/excform \
sc/source/filter/excel/excform8 \ sc/source/filter/excel/excform8 \
sc/source/filter/excel/excimp8 \ sc/source/filter/excel/excimp8 \
sc/source/filter/excel/excrecds \ sc/source/filter/excel/excrecds \
sc/source/filter/excel/exctools \ sc/source/filter/excel/exctools \
sc/source/filter/excel/expop2 \ sc/source/filter/excel/expop2 \
sc/source/filter/excel/fontbuff \ sc/source/filter/excel/fontbuff \
sc/source/filter/excel/frmbase \ sc/source/filter/excel/frmbase \
sc/source/filter/excel/impop \ sc/source/filter/excel/impop \
sc/source/filter/excel/namebuff \ sc/source/filter/excel/namebuff \
sc/source/filter/excel/read \ sc/source/filter/excel/read \
sc/source/filter/excel/tokstack \ sc/source/filter/excel/tokstack \
sc/source/filter/excel/xechart \ sc/source/filter/excel/xechart \
sc/source/filter/excel/xecontent \ sc/source/filter/excel/xecontent \
sc/source/filter/excel/xeescher \ sc/source/filter/excel/xeescher \
sc/source/filter/excel/xeformula \ sc/source/filter/excel/xeformula \
sc/source/filter/excel/xehelper \ sc/source/filter/excel/xehelper \
sc/source/filter/excel/xelink \ sc/source/filter/excel/xelink \
sc/source/filter/excel/xename \ sc/source/filter/excel/xename \
sc/source/filter/excel/xepage \ sc/source/filter/excel/xepage \
sc/source/filter/excel/xepivot \ sc/source/filter/excel/xepivot \
sc/source/filter/excel/xerecord \ sc/source/filter/excel/xerecord \
sc/source/filter/excel/xeroot \ sc/source/filter/excel/xeroot \
sc/source/filter/excel/xestream \ sc/source/filter/excel/xestream \
sc/source/filter/excel/xestring \ sc/source/filter/excel/xestring \
sc/source/filter/excel/xestyle \ sc/source/filter/excel/xestyle \
sc/source/filter/excel/xetable \ sc/source/filter/excel/xetable \
sc/source/filter/excel/xeview \ sc/source/filter/excel/xeview \
sc/source/filter/excel/xichart \ sc/source/filter/excel/xichart \
sc/source/filter/excel/xicontent \ sc/source/filter/excel/xicontent \
sc/source/filter/excel/xiescher \ sc/source/filter/excel/xiescher \
sc/source/filter/excel/xiformula \ sc/source/filter/excel/xiformula \
sc/source/filter/excel/xihelper \ sc/source/filter/excel/xihelper \
sc/source/filter/excel/xilink \ sc/source/filter/excel/xilink \
sc/source/filter/excel/xiname \ sc/source/filter/excel/xiname \
sc/source/filter/excel/xipage \ sc/source/filter/excel/xipage \
sc/source/filter/excel/xipivot \ sc/source/filter/excel/xipivot \
sc/source/filter/excel/xiroot \ sc/source/filter/excel/xiroot \
sc/source/filter/excel/xistream \ sc/source/filter/excel/xistream \
sc/source/filter/excel/xistring \ sc/source/filter/excel/xistring \
sc/source/filter/excel/xistyle \ sc/source/filter/excel/xistyle \
sc/source/filter/excel/xiview \ sc/source/filter/excel/xiview \
sc/source/filter/excel/xladdress \ sc/source/filter/excel/xladdress \
sc/source/filter/excel/xlchart \ sc/source/filter/excel/xlchart \
sc/source/filter/excel/xlescher \ sc/source/filter/excel/xlescher \
sc/source/filter/excel/xlformula \ sc/source/filter/excel/xlformula \
sc/source/filter/excel/xlpage \ sc/source/filter/excel/xlpage \
sc/source/filter/excel/xlpivot \ sc/source/filter/excel/xlpivot \
sc/source/filter/excel/xlroot \ sc/source/filter/excel/xlroot \
sc/source/filter/excel/xlstyle \ sc/source/filter/excel/xlstyle \
sc/source/filter/excel/xltoolbar \ sc/source/filter/excel/xltoolbar \
sc/source/filter/excel/xltools \ sc/source/filter/excel/xltools \
sc/source/filter/excel/xltracer \ sc/source/filter/excel/xltracer \
sc/source/filter/excel/xlview \ sc/source/filter/excel/xlview \
sc/source/filter/ftools/fapihelper \ sc/source/filter/ftools/fapihelper \
sc/source/filter/ftools/fprogressbar \ sc/source/filter/ftools/fprogressbar \
sc/source/filter/ftools/ftools \ sc/source/filter/ftools/ftools \
sc/source/filter/html/htmlexp \ sc/source/filter/html/htmlexp \
sc/source/filter/html/htmlexp2 \ sc/source/filter/html/htmlexp2 \
sc/source/filter/html/htmlimp \ sc/source/filter/html/htmlimp \
sc/source/filter/html/htmlpars \ sc/source/filter/html/htmlpars \
sc/source/filter/lotus/expop \ sc/source/filter/lotus/expop \
sc/source/filter/lotus/export \ sc/source/filter/lotus/export \
sc/source/filter/lotus/filter \ sc/source/filter/lotus/filter \
sc/source/filter/lotus/lotattr \ sc/source/filter/lotus/lotattr \
sc/source/filter/lotus/lotform \ sc/source/filter/lotus/lotform \
sc/source/filter/lotus/lotimpop \ sc/source/filter/lotus/lotimpop \
sc/source/filter/lotus/lotread \ sc/source/filter/lotus/lotread \
sc/source/filter/lotus/lotus \ sc/source/filter/lotus/lotus \
sc/source/filter/lotus/memory \ sc/source/filter/lotus/memory \
sc/source/filter/lotus/op \ sc/source/filter/lotus/op \
sc/source/filter/lotus/tool \ sc/source/filter/lotus/tool \
sc/source/filter/qpro/biff \ sc/source/filter/qpro/biff \
sc/source/filter/qpro/qpro \ sc/source/filter/qpro/qpro \
sc/source/filter/qpro/qproform \ sc/source/filter/qpro/qproform \
sc/source/filter/qpro/qprostyle \ sc/source/filter/qpro/qprostyle \
sc/source/filter/rtf/eeimpars \ sc/source/filter/rtf/eeimpars \
sc/source/filter/rtf/expbase \ sc/source/filter/rtf/expbase \
sc/source/filter/rtf/rtfexp \ sc/source/filter/rtf/rtfexp \
sc/source/filter/rtf/rtfimp \ sc/source/filter/rtf/rtfimp \
sc/source/filter/rtf/rtfparse \ sc/source/filter/rtf/rtfparse \
sc/source/filter/starcalc/collect \ sc/source/filter/starcalc/collect \
sc/source/filter/starcalc/scflt \ sc/source/filter/starcalc/scflt \
sc/source/filter/starcalc/scfobj \ sc/source/filter/starcalc/scfobj \
sc/source/filter/xcl97/XclExpChangeTrack \ sc/source/filter/xcl97/XclExpChangeTrack \
sc/source/filter/xcl97/XclImpChangeTrack \ sc/source/filter/xcl97/XclImpChangeTrack \
sc/source/filter/xcl97/xcl97esc \ sc/source/filter/xcl97/xcl97esc \
sc/source/filter/xcl97/xcl97rec \ sc/source/filter/xcl97/xcl97rec \
)) ))
$(eval $(call gb_Library_add_noexception_objects,scfilt,\ $(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: # vim: set noet sw=4 ts=4:
...@@ -66,71 +66,71 @@ $(eval $(call gb_Library_add_linked_libs,vbaobj,\ ...@@ -66,71 +66,71 @@ $(eval $(call gb_Library_add_linked_libs,vbaobj,\
)) ))
$(eval $(call gb_Library_add_exception_objects,vbaobj,\ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
sc/source/ui/vba/excelvbahelper \ sc/source/ui/vba/excelvbahelper \
sc/source/ui/vba/service \ sc/source/ui/vba/service \
sc/source/ui/vba/vbaapplication \ sc/source/ui/vba/vbaapplication \
sc/source/ui/vba/vbaassistant \ sc/source/ui/vba/vbaassistant \
sc/source/ui/vba/vbaaxes \ sc/source/ui/vba/vbaaxes \
sc/source/ui/vba/vbaaxis \ sc/source/ui/vba/vbaaxis \
sc/source/ui/vba/vbaaxistitle \ sc/source/ui/vba/vbaaxistitle \
sc/source/ui/vba/vbaborders \ sc/source/ui/vba/vbaborders \
sc/source/ui/vba/vbacharacters \ sc/source/ui/vba/vbacharacters \
sc/source/ui/vba/vbachart \ sc/source/ui/vba/vbachart \
sc/source/ui/vba/vbachartobject \ sc/source/ui/vba/vbachartobject \
sc/source/ui/vba/vbachartobjects \ sc/source/ui/vba/vbachartobjects \
sc/source/ui/vba/vbacharttitle \ sc/source/ui/vba/vbacharttitle \
sc/source/ui/vba/vbacomment \ sc/source/ui/vba/vbacomment \
sc/source/ui/vba/vbacomments \ sc/source/ui/vba/vbacomments \
sc/source/ui/vba/vbacondition \ sc/source/ui/vba/vbacondition \
sc/source/ui/vba/vbadialog \ sc/source/ui/vba/vbadialog \
sc/source/ui/vba/vbadialogs \ sc/source/ui/vba/vbadialogs \
sc/source/ui/vba/vbaeventshelper \ sc/source/ui/vba/vbaeventshelper \
sc/source/ui/vba/vbafiledialog \ sc/source/ui/vba/vbafiledialog \
sc/source/ui/vba/vbafiledialogselecteditems \ sc/source/ui/vba/vbafiledialogselecteditems \
sc/source/ui/vba/vbafilesearch \ sc/source/ui/vba/vbafilesearch \
sc/source/ui/vba/vbafont \ sc/source/ui/vba/vbafont \
sc/source/ui/vba/vbaformat \ sc/source/ui/vba/vbaformat \
sc/source/ui/vba/vbaformatcondition \ sc/source/ui/vba/vbaformatcondition \
sc/source/ui/vba/vbaformatconditions \ sc/source/ui/vba/vbaformatconditions \
sc/source/ui/vba/vbafoundfiles \ sc/source/ui/vba/vbafoundfiles \
sc/source/ui/vba/vbaglobals \ sc/source/ui/vba/vbaglobals \
sc/source/ui/vba/vbahyperlink \ sc/source/ui/vba/vbahyperlink \
sc/source/ui/vba/vbahyperlinks \ sc/source/ui/vba/vbahyperlinks \
sc/source/ui/vba/vbainterior \ sc/source/ui/vba/vbainterior \
sc/source/ui/vba/vbamenubar \ sc/source/ui/vba/vbamenubar \
sc/source/ui/vba/vbamenubars \ sc/source/ui/vba/vbamenubars \
sc/source/ui/vba/vbamenu \ sc/source/ui/vba/vbamenu \
sc/source/ui/vba/vbamenus \ sc/source/ui/vba/vbamenus \
sc/source/ui/vba/vbamenuitem \ sc/source/ui/vba/vbamenuitem \
sc/source/ui/vba/vbamenuitems \ sc/source/ui/vba/vbamenuitems \
sc/source/ui/vba/vbaname \ sc/source/ui/vba/vbaname \
sc/source/ui/vba/vbanames \ sc/source/ui/vba/vbanames \
sc/source/ui/vba/vbaoleobject \ sc/source/ui/vba/vbaoleobject \
sc/source/ui/vba/vbaoleobjects \ sc/source/ui/vba/vbaoleobjects \
sc/source/ui/vba/vbaoutline \ sc/source/ui/vba/vbaoutline \
sc/source/ui/vba/vbapagebreak \ sc/source/ui/vba/vbapagebreak \
sc/source/ui/vba/vbapagebreaks \ sc/source/ui/vba/vbapagebreaks \
sc/source/ui/vba/vbapagesetup \ sc/source/ui/vba/vbapagesetup \
sc/source/ui/vba/vbapalette \ sc/source/ui/vba/vbapalette \
sc/source/ui/vba/vbapane \ sc/source/ui/vba/vbapane \
sc/source/ui/vba/vbapivotcache \ sc/source/ui/vba/vbapivotcache \
sc/source/ui/vba/vbapivottable \ sc/source/ui/vba/vbapivottable \
sc/source/ui/vba/vbapivottables \ sc/source/ui/vba/vbapivottables \
sc/source/ui/vba/vbaquerytable \ sc/source/ui/vba/vbaquerytable \
sc/source/ui/vba/vbarange \ sc/source/ui/vba/vbarange \
sc/source/ui/vba/vbasheetobject \ sc/source/ui/vba/vbasheetobject \
sc/source/ui/vba/vbastyle \ sc/source/ui/vba/vbastyle \
sc/source/ui/vba/vbastyles \ sc/source/ui/vba/vbastyles \
sc/source/ui/vba/vbatextboxshape \ sc/source/ui/vba/vbatextboxshape \
sc/source/ui/vba/vbatextframe \ sc/source/ui/vba/vbatextframe \
sc/source/ui/vba/vbavalidation \ sc/source/ui/vba/vbavalidation \
sc/source/ui/vba/vbawindow \ sc/source/ui/vba/vbawindow \
sc/source/ui/vba/vbawindows \ sc/source/ui/vba/vbawindows \
sc/source/ui/vba/vbaworkbook \ sc/source/ui/vba/vbaworkbook \
sc/source/ui/vba/vbaworkbooks \ sc/source/ui/vba/vbaworkbooks \
sc/source/ui/vba/vbaworksheet \ sc/source/ui/vba/vbaworksheet \
sc/source/ui/vba/vbaworksheets \ sc/source/ui/vba/vbaworksheets \
sc/source/ui/vba/vbawsfunction \ sc/source/ui/vba/vbawsfunction \
)) ))
#http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50255 #http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50255
...@@ -140,8 +140,8 @@ endif ...@@ -140,8 +140,8 @@ endif
ifeq ($(gccthunkBroken),1) ifeq ($(gccthunkBroken),1)
$(eval $(call gb_Library_add_cxxobjects,vbaobj,\ $(eval $(call gb_Library_add_cxxobjects,vbaobj,\
sc/source/ui/vba/vbasheetobjects \ sc/source/ui/vba/vbasheetobjects \
, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
)) ))
else else
$(eval $(call gb_Library_add_exception_objects,vbaobj,\ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
......
...@@ -27,9 +27,9 @@ $(eval $(call gb_Library_add_sdi_headers,sm,starmath/sdi/smslots)) ...@@ -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_componentfile,sm,starmath/util/sm))
$(eval $(call gb_Library_set_include,sm,\ $(eval $(call gb_Library_set_include,sm,\
-I$(realpath $(SRCDIR)/starmath/inc) \ -I$(realpath $(SRCDIR)/starmath/inc) \
-I$(WORKDIR)/SdiTarget/starmath/sdi \ -I$(WORKDIR)/SdiTarget/starmath/sdi \
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
$(eval $(call gb_Library_add_api,sm,\ $(eval $(call gb_Library_add_api,sm,\
...@@ -38,69 +38,69 @@ $(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,\ $(eval $(call gb_Library_add_linked_libs,sm,\
comphelper \ comphelper \
cppu \ cppu \
cppuhelper \ cppuhelper \
editeng \ editeng \
i18npaper \ i18npaper \
msfilter \ msfilter \
oox \ oox \
sal \ sal \
sax \ sax \
sfx \ sfx \
sot \ sot \
svl \ svl \
svt \ svt \
svx \ svx \
svxcore \ svxcore \
tk \ tk \
tl \ tl \
utl \ utl \
vcl \ vcl \
xo \ xo \
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(eval $(call gb_Library_add_exception_objects,sm,\ $(eval $(call gb_Library_add_exception_objects,sm,\
starmath/source/accessibility \ starmath/source/accessibility \
starmath/source/action \ starmath/source/action \
starmath/source/caret \ starmath/source/caret \
starmath/source/cfgitem \ starmath/source/cfgitem \
starmath/source/config \ starmath/source/config \
starmath/source/cursor \ starmath/source/cursor \
starmath/source/dialog \ starmath/source/dialog \
starmath/source/document \ starmath/source/document \
starmath/source/edit \ starmath/source/edit \
starmath/source/format \ starmath/source/format \
starmath/source/mathmlexport \ starmath/source/mathmlexport \
starmath/source/mathmlimport \ starmath/source/mathmlimport \
starmath/source/mathtype \ starmath/source/mathtype \
starmath/source/node \ starmath/source/node \
starmath/source/ooxmlexport \ starmath/source/ooxmlexport \
starmath/source/ooxmlimport \ starmath/source/ooxmlimport \
starmath/source/parse \ starmath/source/parse \
starmath/source/rect \ starmath/source/rect \
starmath/source/register \ starmath/source/register \
starmath/source/smdll \ starmath/source/smdll \
starmath/source/smmod \ starmath/source/smmod \
starmath/source/symbol \ starmath/source/symbol \
starmath/source/toolbox \ starmath/source/toolbox \
starmath/source/typemap \ starmath/source/typemap \
starmath/source/types \ starmath/source/types \
starmath/source/unodoc \ starmath/source/unodoc \
starmath/source/unomodel \ starmath/source/unomodel \
starmath/source/utility \ starmath/source/utility \
starmath/source/view \ starmath/source/view \
starmath/source/visitors \ starmath/source/visitors \
)) ))
$(eval $(call gb_SdiTarget_SdiTarget,starmath/sdi/smslots,starmath/sdi/smath)) $(eval $(call gb_SdiTarget_SdiTarget,starmath/sdi/smslots,starmath/sdi/smath))
$(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\ $(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\
-I$(realpath $(SRCDIR)/starmath/inc) \ -I$(realpath $(SRCDIR)/starmath/inc) \
-I$(realpath $(SRCDIR)/starmath/sdi) \ -I$(realpath $(SRCDIR)/starmath/sdi) \
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -37,8 +37,8 @@ $(eval $(call gb_AllLangResTarget_add_srs,vcl,\ ...@@ -37,8 +37,8 @@ $(eval $(call gb_AllLangResTarget_add_srs,vcl,\
$(eval $(call gb_SrsTarget_SrsTarget,vcl/source/src)) $(eval $(call gb_SrsTarget_SrsTarget,vcl/source/src))
$(eval $(call gb_SrsTarget_set_include,vcl/source/src,\ $(eval $(call gb_SrsTarget_set_include,vcl/source/src,\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(realpath $(SRCDIR)/vcl/inc) \ -I$(realpath $(SRCDIR)/vcl/inc) \
)) ))
$(eval $(call gb_SrsTarget_add_files,vcl/source/src,\ $(eval $(call gb_SrsTarget_add_files,vcl/source/src,\
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
$(eval $(call gb_WinResTarget_WinResTarget,vcl/src)) $(eval $(call gb_WinResTarget_WinResTarget,vcl/src))
$(eval $(call gb_WinResTarget_set_include,vcl/src,\ $(eval $(call gb_WinResTarget_set_include,vcl/src,\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(realpath $(SRCDIR)/vcl/inc) \ -I$(realpath $(SRCDIR)/vcl/inc) \
)) ))
$(eval $(call gb_WinResTarget_add_file,vcl/src,\ $(eval $(call gb_WinResTarget_add_file,vcl/src,\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment