Hello,
git master (from yesterday) does not compile for me with
--disable-database-connectivity, attached a patch that tries to fix the
easy stuff. Is it ok to disable the form stuff, is this only base related?
Then there is svx faling in tail_build:
http://pastebin.com/HbD64M2V
Do you think, should i add ifdefery to .[ch]xx or just try to don't
build the stuff requiring db?
I find --disable-database-connectivity interesting because i'd like to
build a base-less libreoffice.
thanks
--
Riccardo Magliocchetti
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 7faa693..d0490ea 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -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,\
diff --git a/forms/Module_forms.mk b/forms/Module_forms.mk
index 6f14722..15bbbd3 100644
--- a/forms/Module_forms.mk
+++ b/forms/Module_forms.mk
@@ -26,8 +26,10 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
+
$(eval $(call gb_Module_Module,forms))
+ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,forms,\
AllLangResTarget_frm \
Library_frm \
@@ -39,4 +41,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,forms,\
JunitTest_forms_complex \
))
+endif
+
# vim: set noet sw=4 ts=4:
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice