Repository.mk | 17 ++++++++---------
connectivity/Module_connectivity.mk | 8 +-------
2 files changed, 9 insertions(+), 16 deletions(-)
New commits:
commit 0cbe2e92a24be1354f9b058b6584aaed40ddb6ce
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Feb 4 17:29:23 2015 +0100
connectivity: just check the WITH_MOZAB4WIN variable
Either build mozab or mork driver, and install it in Repository.mk too.
Change-Id: I456d6cb4ebe99625a64a960d1133cb06d836e8c7
diff --git a/Repository.mk b/Repository.mk
index 8f948a5..095dfba 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -460,20 +460,19 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
xof \
xsltdlg \
xsltfilter \
+ $(if $(WITH_MOZAB4WIN), \
+ mozab2 \
+ mozabdrv \
+ ) \
+ $(if $(WITH_MOZAB4WIN),,\
+ mork \
+ mozbootstrap \
+ ) \
$(if $(filter $(OS),WNT), \
ado \
$(if $(DISABLE_ATL),,oleautobridge) \
smplmail \
wininetbe1 \
- $(if $(WITH_MOZAB4WIN), \
- mozab2 \
- mozabdrv \
- ) \
- $(if $(WITH_MOZAB4WIN),,mozbootstrap) \
- ) \
- $(if $(filter $(OS),WNT),, \
- mork \
- mozbootstrap \
) \
$(if $(filter $(OS),MACOSX), \
$(if $(ENABLE_MACOSX_SANDBOX),, \
diff --git a/connectivity/Module_connectivity.mk
b/connectivity/Module_connectivity.mk
index 1ba9e7b..4616eb3 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -102,19 +102,13 @@ $(eval $(call gb_Module_add_targets,connectivity,\
))
endif
-ifeq ($(OS)-$(CPUNAME),WNT-INTEL)
-
ifneq ($(WITH_MOZAB4WIN),)
+
$(eval $(call gb_Module_add_targets,connectivity,\
Configuration_mozab \
Library_mozab \
Library_mozabdrv \
))
-else
-$(eval $(call gb_Module_add_targets,connectivity,\
- Library_mozbootstrap \
-))
-endif
else ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
