better conditions for registering executables

Change-Id: I197b5e35ee8e7b80f6bba3e59c811ab4261c489c

better conditions for registering executables
Change-Id: I197b5e35ee8e7b80f6bba3e59c811ab4261c489c
e78fe7af · Matúš Kukan · d330f3a2 · e78fe7af
Kaydet (Commit) e78fe7af authored Haz 11, 2013 tarafından Matúš Kukan
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

Repository.mk Repository.mk +6 -6

No files found.
--- a/Repository.mk
+++ b/Repository.mk
@@ -151,16 +151,16 @@ endif

 endif

-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
-	regmerge \
-	regview \
-	$(if $(and $(SOLAR_JAVA),$(filter-out MACOSX WNT,$(OS))),javaldx) \
+	$(if $(filter-out IOS,$(OS)), \
+		regmerge \
+		regview \
+	) \
+	$(if $(and $(SOLAR_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \
 ))
 $(eval $(call gb_Helper_register_executables,UREBIN,\
-	uno \
+	$(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \
 ))
-endif

 ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES)
 $(eval $(call gb_Helper_register_executables,OOO,\