headless build: build oosplash again

It looks like we want it so revert:
dae66b7b
4d408cc2
64a530cf

Change-Id: I7cd410861b28a0556de3375a0865a7baef52bd78

desktop/CustomTarget_soffice.mk

@@ -40,10 +40,4 @@ else
 	cp $< $@
 endif
 
-ifeq ($(strip $(ENABLE_HEADLESS)),TRUE)
-	sed -i "s/@SOFFICEBIN@/soffice.bin/" $@
-else
-	sed -i "s/@SOFFICEBIN@/oosplash/" $@
-endif
-
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:

desktop/Module_desktop.mk

@@ -116,6 +116,11 @@ else ifeq ($(OS),IOS)
 
 else ifeq ($(GUIBASE),headless)
 
+$(eval $(call gb_Module_add_targets,desktop,\
+    Executable_oosplash \
+    Library_spl_unx \
+))
+
 else
 
 $(eval $(call gb_Module_add_targets,desktop,\

desktop/scripts/soffice.sh

@@ -175,4 +175,4 @@ for arg in $@ ; do
 done
 
 # oosplash does the rest: forcing pages in, javaldx etc. are
-exec $VALGRINDCHECK $STRACECHECK "$sd_prog/@SOFFICEBIN@" "$@"
+exec $VALGRINDCHECK $STRACECHECK "$sd_prog/oosplash" "$@"

scp2/source/ooo/common_brand.scp

@@ -525,7 +525,7 @@ File gid_Brand_File_Bin_Soffice_Bin
     Name = "soffice.bin";
 End
 
-#if defined UNX && ! defined MACOSX && ! defined LIBO_HEADLESS
+#if defined UNX && ! defined MACOSX
 
 File gid_File_Bin_QStart_Bin
     BIN_FILE_BODY;