Combine individual gb_Module_add_check_targets, and sort

Change-Id: Ia625a33371d2278bd89274ed5ee18acb773810cf

sal/Module_sal.mk

@@ -28,47 +28,39 @@ $(eval $(call gb_Module_add_targets,sal,\
 ))
 
 $(eval $(call gb_Module_add_check_targets,sal,\
-		CppunitTest_sal_osl_process \
-))
-
-$(eval $(call gb_Module_add_check_targets,sal,\
+	$(if $(filter $(OS),WNT),,CppunitTest_sal_osl_file) \
 	$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,CppunitTest_Module_DLL) \
+	$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,CppunitTest_sal_osl_module) \
+	$(if $(filter-out MSC-120,$(COM)-$(VCVER)),CppunitTest_sal_osl_security) \
 	CppunitTest_sal_bytesequence \
 	CppunitTest_sal_osl_condition \
-	$(if $(filter $(OS),WNT),, \
-		CppunitTest_sal_osl_file) \
-	$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,CppunitTest_sal_osl_module) \
+	CppunitTest_sal_osl_mutex \
 	CppunitTest_sal_osl_old_test_file \
-	$(if $(filter-out MSC-120,$(COM)-$(VCVER)),CppunitTest_sal_osl_security) \
+	CppunitTest_sal_osl_pipe \
+	CppunitTest_sal_osl_process \
+	CppunitTest_sal_osl_profile \
+	CppunitTest_sal_osl_setthreadname \
 	CppunitTest_sal_osl_thread \
 	CppunitTest_sal_rtl_alloc \
-	CppunitTest_sal_rtl_process \
 	CppunitTest_sal_rtl_bootstrap \
 	CppunitTest_sal_rtl_cipher \
 	CppunitTest_sal_rtl_crc32 \
 	CppunitTest_sal_rtl_digest \
 	CppunitTest_sal_rtl_doublelock \
 	CppunitTest_sal_rtl_locale \
+	CppunitTest_sal_rtl_math \
 	CppunitTest_sal_rtl_ostringbuffer \
-	CppunitTest_sal_rtl_oustringbuffer \
 	CppunitTest_sal_rtl_oustring \
+	CppunitTest_sal_rtl_oustringbuffer \
+	CppunitTest_sal_rtl_process \
+	CppunitTest_sal_rtl_strings \
 	CppunitTest_sal_rtl_textenc \
 	CppunitTest_sal_rtl_uri \
-	CppunitTest_sal_rtl_strings \
 	CppunitTest_sal_rtl_uuid \
 	CppunitTest_sal_tcwf \
 	CppunitTest_sal_types \
 ))
 
-# these were added when gbuild'izing
-$(eval $(call gb_Module_add_check_targets,sal,\
-	CppunitTest_sal_osl_mutex \
-	CppunitTest_sal_osl_pipe \
-	CppunitTest_sal_osl_profile \
-	CppunitTest_sal_osl_setthreadname \
-	CppunitTest_sal_rtl_math \
-))
-
 endif
 
 # error when building test-getsystempathfromfileurl.cxx \