diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-18 18:25:29 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-18 18:26:42 +0200 |
| commit | fe4c47e41febceb4972d79874ccae4704be9b34b (patch) | |
| tree | 985b18a19812c8e572824f8a011cf380a54b405a /connectivity/Module_connectivity.mk | |
| parent | 64d1fcb11f4915df960ec81bc9168a557199090f (diff) | |
Some clean-up of mork-related changs
And reverted for now the configure error when --enable-mozilla on non-Windows;
it is still used for other features, too.
Change-Id: I1ce5ff1a7a3d140a1ab7ba1e905166d91229c926
Diffstat (limited to 'connectivity/Module_connectivity.mk')
| -rw-r--r-- | connectivity/Module_connectivity.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 50727ee45329..beb34bdc3c5b 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -115,29 +115,25 @@ $(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) +ifeq ($(if $(or $(filter-out YES,$(WITH_MOZILLA)),$(filter YES,$(SYSTEM_MOZILLA))),YES),YES) $(eval $(call gb_Module_add_targets,connectivity,\ Library_mozbootstrap \ )) else $(eval $(call gb_Module_add_targets,connectivity,\ + Configuration_mozab \ Library_mozab \ Library_mozabdrv \ )) - -$(eval $(call gb_Module_add_targets,connectivity,\ - Configuration_mozab \ -)) endif -else # the new and shiny mork driver ;-) +else ifneq ($(filter-out ANDROID IOS,$(OS)),) $(eval $(call gb_Module_add_targets,connectivity,\ - Executable_mork_helper \ Configuration_mork \ + Executable_mork_helper \ Library_mork \ )) |