diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2015-04-15 23:41:45 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2015-04-15 23:42:08 +0200 |
| commit | 4daf6600a3f5c1d58ff1c79396f05d3ea5cb7103 (patch) | |
| tree | b62c2328a3cec07fe0bed2a76f704ea8e33f265e /Repository.mk | |
| parent | fa3daee4b694202009f3d98c7b374825ec34605d (diff) | |
Move these together
Change-Id: I0352e3180d553c46c6ca905628d5b46d1af0b8a7
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/Repository.mk b/Repository.mk index 0928df685631..f9a5208e9c01 100644 --- a/Repository.mk +++ b/Repository.mk @@ -186,26 +186,6 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ )) -ifneq (,$(filter ANDROID IOS,$(OS))) - -# these are in NONE layer because -# a) scp2 is not used on mobile b) layers don't mean anything on mobile -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ - $(if $(filter $(OS),ANDROID), \ - lo-bootstrap \ - ) \ -)) - -endif - -ifeq ($(OS),MACOSX) - -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ - OOoSpotlightImporter \ -)) - -endif - $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \ abp \ dbp \ @@ -519,6 +499,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \ writerfilter \ )) +# cli_cppuhelper is NONE even though it is actually in URE because it is CliNativeLibrary $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ getuid \ smoketest \ @@ -533,6 +514,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ vclbootstrapprotector \ scqahelper \ unowinreg \ + $(if $(filter MSC,$(COM)),cli_cppuhelper) \ + $(if $(filter $(OS),ANDROID),lo-bootstrap) \ + $(if $(filter $(OS),MACOSX),OOoSpotlightImporter) \ )) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \ @@ -576,11 +560,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \ xmlreader \ )) -# this is NONE even though it is actually in URE because it is CliNativeLibrary -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ - $(if $(filter MSC,$(COM)),cli_cppuhelper) \ -)) - $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(if $(ENABLE_VLC),avmediavlc) \ $(if $(ENABLE_GSTREAMER_1_0),avmediagst) \ |