diff options
| -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))) |