diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-02-04 17:29:23 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-04 17:32:21 +0100 |
| commit | 0cbe2e92a24be1354f9b058b6584aaed40ddb6ce (patch) | |
| tree | 9d6f7bdb0ee14ea1d6eb91ae7a7208237fd0e215 | |
| parent | 4904180247c0d5745a393e3cd57eaae29f3837e5 (diff) | |
connectivity: just check the WITH_MOZAB4WIN variable
Either build mozab or mork driver, and install it in Repository.mk too.
Change-Id: I456d6cb4ebe99625a64a960d1133cb06d836e8c7
| -rw-r--r-- | Repository.mk | 17 | ||||
| -rw-r--r-- | connectivity/Module_connectivity.mk | 8 |
2 files changed, 9 insertions, 16 deletions
diff --git a/Repository.mk b/Repository.mk index 8f948a502052..095dfba53908 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 1ba9e7bd3a20..4616eb3d3292 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))) |