Kaydet (Commit) 0cbe2e92 authored tarafından Michael Stahl's avatar Michael Stahl

connectivity: just check the WITH_MOZAB4WIN variable

Either build mozab or mork driver, and install it in Repository.mk too.

Change-Id: I456d6cb4ebe99625a64a960d1133cb06d836e8c7
üst 49041802
...@@ -460,21 +460,20 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ ...@@ -460,21 +460,20 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
xof \ xof \
xsltdlg \ xsltdlg \
xsltfilter \ xsltfilter \
$(if $(filter $(OS),WNT), \
ado \
$(if $(DISABLE_ATL),,oleautobridge) \
smplmail \
wininetbe1 \
$(if $(WITH_MOZAB4WIN), \ $(if $(WITH_MOZAB4WIN), \
mozab2 \ mozab2 \
mozabdrv \ mozabdrv \
) \ ) \
$(if $(WITH_MOZAB4WIN),,mozbootstrap) \ $(if $(WITH_MOZAB4WIN),,\
) \
$(if $(filter $(OS),WNT),, \
mork \ mork \
mozbootstrap \ mozbootstrap \
) \ ) \
$(if $(filter $(OS),WNT), \
ado \
$(if $(DISABLE_ATL),,oleautobridge) \
smplmail \
wininetbe1 \
) \
$(if $(filter $(OS),MACOSX), \ $(if $(filter $(OS),MACOSX), \
$(if $(ENABLE_MACOSX_SANDBOX),, \ $(if $(ENABLE_MACOSX_SANDBOX),, \
AppleRemote \ AppleRemote \
......
...@@ -102,19 +102,13 @@ $(eval $(call gb_Module_add_targets,connectivity,\ ...@@ -102,19 +102,13 @@ $(eval $(call gb_Module_add_targets,connectivity,\
)) ))
endif endif
ifeq ($(OS)-$(CPUNAME),WNT-INTEL)
ifneq ($(WITH_MOZAB4WIN),) ifneq ($(WITH_MOZAB4WIN),)
$(eval $(call gb_Module_add_targets,connectivity,\ $(eval $(call gb_Module_add_targets,connectivity,\
Configuration_mozab \ Configuration_mozab \
Library_mozab \ Library_mozab \
Library_mozabdrv \ Library_mozabdrv \
)) ))
else
$(eval $(call gb_Module_add_targets,connectivity,\
Library_mozbootstrap \
))
endif
else ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) else ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment