mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix most of the build with --disable-database-connectivity

Browse Source
This commit is contained in:
Riccardo Magliocchetti
2012-02-21 12:49:09 +01:00
committed by Tor Lillqvist
parent deb9b28697
commit 84c8559820
7 changed files with 102 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
extensions/Module_extensions.mk
View File

@@ -29,21 +29,26 @@ $(eval $(call gb_Module_Module,extensions))
$(eval $(call gb_Module_add_targets,extensions,\
AllLangResTarget_abp \
AllLangResTarget_bib \
AllLangResTarget_dbp \
AllLangResTarget_pcr \
AllLangResTarget_scn \
AllLangResTarget_upd \
Library_abp \
Library_bib \
Library_dbp \
Library_log \
Library_pcr \
Library_res \
Library_scn \
))
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,extensions,\
AllLangResTarget_bib \
AllLangResTarget_dbp \
AllLangResTarget_pcr \
Library_bib \
Library_dbp \
Library_pcr \
Package_bib \
Package_pcr \
))
endif
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,extensions,\

2
forms/Module_forms.mk
View File

@@ -28,6 +28,7 @@
$(eval $(call gb_Module_Module,forms))
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,forms,\
AllLangResTarget_frm \
Library_frm \
@@ -38,5 +39,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,forms,\
JunitTest_forms_unoapi \
JunitTest_forms_complex \
))
endif
# vim: set noet sw=4 ts=4:

6
sc/source/ui/docshell/docsh8.cxx
View File

@@ -26,10 +26,7 @@
*
************************************************************************/
// INCLUDE ---------------------------------------------------------------
#ifndef DISABLE_DBCONNECTIVITY
#include <stdio.h>
#include <tools/urlobj.hxx>
@@ -1166,5 +1163,6 @@ sal_uLong ScDocShell::DBaseExport( const rtl::OUString& rFullFileName, CharSet e
return nErr;
}
#endif // !DISABLE_DBCONNECTIVITY
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

25
svx/Library_svx.mk
View File

@@ -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 \

109
svx/Library_svxcore.mk
View File

@@ -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

2
svx/Package_inc.mk
View File

@@ -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))

21
sw/Library_sw.mk
View File

@@ -563,14 +563,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/ui/config/uinums \
sw/source/ui/config/usrpref \
sw/source/ui/config/viewopt \
sw/source/ui/dbui/dbmgr \
sw/source/ui/dbui/dbtree \
sw/source/ui/dbui/dbui \
sw/source/ui/dbui/maildispatcher \
sw/source/ui/dbui/mailmergechildwindow \
sw/source/ui/dbui/mailmergehelper \
sw/source/ui/dbui/mmconfigitem \
sw/source/ui/dbui/swdbtoolsclient \
sw/source/ui/dialog/SwSpellDialogChildWindow \
sw/source/ui/dialog/regionsw \
sw/source/ui/dialog/swabstdlg \
@@ -738,6 +730,19 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/ui/wrtsh/wrtundo \
))
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/ui/dbui/dbmgr \
sw/source/ui/dbui/dbtree \
sw/source/ui/dbui/dbui \
sw/source/ui/dbui/maildispatcher \
sw/source/ui/dbui/mailmergechildwindow \
sw/source/ui/dbui/mailmergehelper \
sw/source/ui/dbui/mmconfigitem \
sw/source/ui/dbui/swdbtoolsclient \
))
endif
$(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter))
$(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\