diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2012-09-18 11:23:52 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2012-09-18 14:17:27 +0000 |
| commit | 903065dda1e574f4791ff40c31e39f14ba710424 (patch) | |
| tree | 1a8e0724031a3747465d61ae0b7e7c927b2e1292 /connectivity/Module_connectivity.mk | |
| parent | b8a331fefc6332baa62144095d3f26cdb456d2c7 (diff) | |
switch build system to mork driver implementation
On all non windows platforms no mozilla is used any more.
On windows it used for O and OE address book access.
Once alternative implementation for it exists,
mozilla can be stripped there too.
Change-Id: I54144005e6a284326b45a34eb958d170e872471e
Reviewed-on: https://gerrit.libreoffice.org/637
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'connectivity/Module_connectivity.mk')
| -rw-r--r-- | connectivity/Module_connectivity.mk | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index a05df43e9174..50727ee45329 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -38,14 +38,12 @@ $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_flat \ Configuration_mysql \ Configuration_odbc \ - Executable_mork_helper \ Library_calc \ Library_dbase \ Library_dbpool2 \ Library_dbtools \ Library_file \ Library_flat \ - Library_mork \ Library_mysql \ Library_odbc \ Library_odbcbase \ @@ -117,26 +115,31 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) endif +# mozab only on windows +ifeq ($(OS),WNT) + ifeq ($(if $(or $(filter-out YES,$(WITH_MOZILLA)),$(filter YES,$(SYSTEM_MOZILLA)),$(filter MACOSX,$(OS))),YES),YES) $(eval $(call gb_Module_add_targets,connectivity,\ Library_mozbootstrap \ )) else - $(eval $(call gb_Module_add_targets,connectivity,\ Library_mozab \ Library_mozabdrv \ )) -ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_mozab \ )) -else +endif + +else # the new and shiny mork driver ;-) + $(eval $(call gb_Module_add_targets,connectivity,\ - Configuration_mozab2 \ + Executable_mork_helper \ + Configuration_mork \ + Library_mork \ )) -endif endif |