Repository.mk: make this file a bit more readable & consistent

Change-Id: Ibfca283cdf89fdb4eded06dde2b2f30b05df6882

Repository.mk

@@ -33,6 +33,8 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 	helpex \
 	idxdict \
 	langsupport \
+	$(if $(ENABLE_TELEPATHY),liboapprover) \
+	$(if $(filter IOS,$(OS)),LibreOffice) \
 	libtest \
 	lngconvex \
 	localize \
@@ -52,9 +54,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 	stringex \
 	transex3 \
 	treex \
-    $(if $(filter UCPP,$(BUILD_TYPE)),\
+	$(if $(filter UCPP,$(BUILD_TYPE)),ucpp) \
-            ucpp \
-    ) \
 	uiex \
 	ulfex \
 	$(call gb_Helper_optional,ODK,unoapploader) \
@@ -62,30 +62,25 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 	xrmex \
 ))
 
-ifneq ($(OS),WNT)
-$(eval $(call gb_Helper_register_executables,NONE,\
-    liboapprover \
-))
-endif
-
 $(eval $(call gb_Helper_register_executables,SDK, \
 	idlc \
-))
+	$(if $(filter-out IOS,$(OS)), \
-
-ifneq ($(OS),IOS)
-
-$(eval $(call gb_Helper_register_executables,SDK, \
 		climaker \
 		cppumaker \
 		javamaker \
 		regcompare \
 		uno-skeletonmaker \
+	) \
 ))
 
-endif
-
 $(eval $(call gb_Helper_register_executables,OOO, \
+	$(if $(filter DESKTOP,$(BUILD_TYPE)),gengal.bin) \
 	gnome-open-url.bin \
+	$(if $(filter YES,$(ENABLE_NPAPI_INTO_BROWSER)),nsplugin) \
+	$(if $(filter MACOSX,$(OS)),officeloader) \
+	$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
+	$(if $(filter YES,$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \
+	$(if $(filter-out WNT,$(OS)),soffice.bin) \
 	spadmin.bin \
 	$(if $(filter $(GUIBASE)$(ENABLE_TDE),unxTRUE), \
 		tdefilepicker \
@@ -95,11 +90,8 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 		kdefilepicker \
 	) \
 	ui-previewer \
-))
+	$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg.bin) \
-
+	$(if $(filter WNT,$(OS)), \
-ifeq ($(OS),WNT)
-
-$(eval $(call gb_Helper_register_executables,OOO,\
 		crashrep_com \
 		gengal \
 		gcc-wrapper \
@@ -125,32 +117,9 @@ $(eval $(call gb_Helper_register_executables,OOO,\
 		unopkg_bin \
 		unopkg_com \
 		unopkgio \
+	) \
 ))
 
-else
-
-$(eval $(call gb_Helper_register_executables,OOO,\
-    soffice.bin \
-    unopkg.bin \
-    gengal.bin \
-))
-
-ifeq ($(OS),MACOSX)
-
-$(eval $(call gb_Helper_register_executables,OOO,\
-    officeloader \
-))
-
-else
-
-$(eval $(call gb_Helper_register_executables,OOO,\
-    oosplash \
-))
-
-endif
-
-endif
-
 $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
 	$(if $(filter-out IOS,$(OS)), \
 		regmerge \
@@ -163,31 +132,17 @@ $(eval $(call gb_Helper_register_executables,UREBIN,\
 ))
 
 ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES)
-$(eval $(call gb_Helper_register_executables,OOO,\
-    pluginapp.bin \
-))
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	pl \
 ))
 endif
 
 ifeq ($(ENABLE_NPAPI_INTO_BROWSER),YES)
-$(eval $(call gb_Helper_register_executables,OOO,\
-    nsplugin \
-))
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	npsoplugin \
 ))
 endif
 
-ifeq ($(OS),IOS)
-
-$(eval $(call gb_Helper_register_executables,NONE,\
-    LibreOffice \
-))
-
-endif
-
 ifeq ($(OS),MACOSX)
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \