diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/Library_svx.mk | 25 | ||||
| -rw-r--r-- | svx/Library_svxcore.mk | 109 | ||||
| -rw-r--r-- | svx/Package_inc.mk | 2 |
3 files changed, 74 insertions, 62 deletions
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 97db17f7da91..a545c409ba17 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -147,16 +147,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/txenctab \ svx/source/dialog/wrapfield \ svx/source/engine3d/float3d \ - svx/source/fmcomp/dbaobjectex \ - svx/source/form/databaselocationinput \ - svx/source/form/dbcharsethelper \ - svx/source/form/filtnav \ - svx/source/form/fmobjfac \ - svx/source/form/fmPropBrw \ - svx/source/form/fmsrccfg \ - svx/source/form/fmsrcimp \ - svx/source/form/tabwin \ - svx/source/form/tbxform \ svx/source/items/algitem \ svx/source/items/hlnkitem \ svx/source/items/numfmtsh \ @@ -213,6 +203,21 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/unogallery/unogalthemeprovider \ )) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) +$(eval $(call gb_Library_use_external,svx,icuuc)) + svx/source/fmcomp/dbaobjectex \ + svx/source/form/databaselocationinput \ + svx/source/form/dbcharsethelper \ + svx/source/form/filtnav \ + svx/source/form/fmobjfac \ + svx/source/form/fmPropBrw \ + svx/source/form/fmsrccfg \ + svx/source/form/fmsrcimp \ + svx/source/form/tabwin \ + svx/source/form/tbxform \ +)) +endif + ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/sendreportunx \ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 508622f004ea..a4e642490ed4 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -123,58 +123,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/engine3d/view3d \ svx/source/engine3d/view3d1 \ svx/source/engine3d/viewpt3d2 \ - svx/source/fmcomp/dbaexchange \ - svx/source/fmcomp/fmgridcl \ - svx/source/fmcomp/fmgridif \ - svx/source/fmcomp/gridcell \ - svx/source/fmcomp/gridcols \ - svx/source/fmcomp/gridctrl \ - svx/source/fmcomp/trace \ - svx/source/fmcomp/xmlexchg \ - svx/source/form/dataaccessdescriptor \ - svx/source/form/datalistener \ - svx/source/form/datanavi \ - svx/source/form/dbtoolsclient \ - svx/source/form/delayedevent \ - svx/source/form/fmcontrolbordermanager \ - svx/source/form/fmcontrollayout \ - svx/source/form/fmdmod \ - svx/source/form/fmdocumentclassification \ - svx/source/form/fmdpage \ - svx/source/form/fmexch \ - svx/source/form/fmexpl \ - svx/source/form/fmitems \ - svx/source/form/fmmodel \ - svx/source/form/fmobj \ - svx/source/form/fmpage \ - svx/source/form/fmpgeimp \ - svx/source/form/fmscriptingenv \ - svx/source/form/fmservs \ - svx/source/form/fmshell \ - svx/source/form/fmshimp \ - svx/source/form/fmtextcontroldialogs \ - svx/source/form/fmtextcontrolfeature \ - svx/source/form/fmtextcontrolshell \ - svx/source/form/fmtools \ - svx/source/form/fmundo \ - svx/source/form/fmview \ - svx/source/form/fmvwimp \ - svx/source/form/formcontrolfactory \ - svx/source/form/formcontroller \ - svx/source/form/formcontrolling \ - svx/source/form/formdispatchinterceptor \ - svx/source/form/formfeaturedispatcher \ - svx/source/form/formtoolbars \ - svx/source/form/legacyformcontroller \ - svx/source/form/navigatortree \ - svx/source/form/navigatortreemodel \ - svx/source/form/ParseContext \ - svx/source/form/sdbdatacolumn \ - svx/source/form/sqlparserclient \ - svx/source/form/stringlistresource \ - svx/source/form/typeconversionclient \ - svx/source/form/typemap \ - svx/source/form/xfm_addcondition \ svx/source/gallery2/codec \ svx/source/gallery2/galbrws \ svx/source/gallery2/galbrws1 \ @@ -433,6 +381,63 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/xoutdev/xtablend \ )) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) +$(eval $(call gb_Library_add_exception_objects,svxcore,\ + svx/source/fmcomp/dbaexchange \ + svx/source/fmcomp/fmgridcl \ + svx/source/fmcomp/fmgridif \ + svx/source/fmcomp/gridcell \ + svx/source/fmcomp/gridcols \ + svx/source/fmcomp/gridctrl \ + svx/source/fmcomp/trace \ + svx/source/fmcomp/xmlexchg \ + svx/source/form/dataaccessdescriptor \ + svx/source/form/datalistener \ + svx/source/form/datanavi \ + svx/source/form/dbtoolsclient \ + svx/source/form/delayedevent \ + svx/source/form/fmcontrolbordermanager \ + svx/source/form/fmcontrollayout \ + svx/source/form/fmdmod \ + svx/source/form/fmdocumentclassification \ + svx/source/form/fmdpage \ + svx/source/form/fmexch \ + svx/source/form/fmexpl \ + svx/source/form/fmitems \ + svx/source/form/fmmodel \ + svx/source/form/fmobj \ + svx/source/form/fmpage \ + svx/source/form/fmpgeimp \ + svx/source/form/fmscriptingenv \ + svx/source/form/fmservs \ + svx/source/form/fmshell \ + svx/source/form/fmshimp \ + svx/source/form/fmtextcontroldialogs \ + svx/source/form/fmtextcontrolfeature \ + svx/source/form/fmtextcontrolshell \ + svx/source/form/fmtools \ + svx/source/form/fmundo \ + svx/source/form/fmview \ + svx/source/form/fmvwimp \ + svx/source/form/formcontrolfactory \ + svx/source/form/formcontroller \ + svx/source/form/formcontrolling \ + svx/source/form/formdispatchinterceptor \ + svx/source/form/formfeaturedispatcher \ + svx/source/form/formtoolbars \ + svx/source/form/legacyformcontroller \ + svx/source/form/navigatortree \ + svx/source/form/navigatortreemodel \ + svx/source/form/ParseContext \ + svx/source/form/sdbdatacolumn \ + svx/source/form/sqlparserclient \ + svx/source/form/stringlistresource \ + svx/source/form/typeconversionclient \ + svx/source/form/typemap \ + svx/source/form/xfm_addcondition \ +)) +endif + # the following source file can't be compiled with optimization by some compilers (crash or endless loop): # Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC # the latter is currently not supported by gbuild and needs a fix here later diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk index bd07e7b0caec..9eaba5bbc73d 100644 --- a/svx/Package_inc.mk +++ b/svx/Package_inc.mk @@ -56,7 +56,9 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShapeFunctionPar $(eval $(call gb_Package_add_file,svx_inc,inc/svx/ucsubset.hxx,svx/ucsubset.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sderitm.hxx,svx/sderitm.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/obj3d.hxx,svx/obj3d.hxx)) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbcharsethelper.hxx,svx/dbcharsethelper.hxx)) +endif $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdangitm.hxx,svx/sdangitm.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/grfcrop.hxx,svx/grfcrop.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxtraitm.hxx,svx/sxtraitm.hxx)) |