diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-07-20 20:30:21 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-20 20:59:17 +0200 |
| commit | 8d3fc64066b157d2e24df57635000f121915793a (patch) | |
| tree | d80d815ac02df5ebc00cc328ad1ca8814f8495b2 | |
| parent | 140ec1e0dd2bbb574a1d468820131c7f0ecd9704 (diff) | |
Repository.mk: cluster the mobile-only stuff together
Change-Id: I77348fce55db78e437431dd07879b4c26f0be893
| -rw-r--r-- | Repository.mk | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Repository.mk b/Repository.mk index c94fff652b16..10c8f62b4393 100644 --- a/Repository.mk +++ b/Repository.mk @@ -131,6 +131,20 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ )) +ifneq (,$(filter ANDROID IOS,$(OS))) + +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + $(if $(filter $(OS),ANDROID), \ + lo-bootstrap \ + ) \ +)) + +$(eval $(call gb_Helper_register_libraries,OOOLIBS, \ + libotouch \ +)) + +endif + ifeq ($(ENABLE_NPAPI_INTO_BROWSER),TRUE) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ npsoplugin \ @@ -455,14 +469,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \ writerfilter \ )) -ifneq (,$(filter ANDROID IOS,$(OS))) - -$(eval $(call gb_Helper_register_libraries,OOOLIBS, \ - libotouch \ -)) - -endif - $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ getuid \ smoketest \ @@ -594,12 +600,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ ) \ )) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - $(if $(filter $(OS),ANDROID), \ - lo-bootstrap \ - ) \ -)) - ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexbinarytable, \ $(if $(DISABLE_ACTIVEX),,\ |