diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2012-09-10 21:20:52 +0200 |
|---|---|---|
| committer | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2012-09-10 21:26:15 +0200 |
| commit | ad050e40f1eb05c49b116ec9d856142f8dc4f635 (patch) | |
| tree | a371fd1df3193cbdfaf54d9593f2864d23ab9c17 /desktop | |
| parent | 7f2e168421c3cd928a31a52a8b5afe97e931d3ba (diff) | |
headless build: build oosplash again
It looks like we want it so revert:
dae66b7b1df89d824017c7afb52f66ebfd2b8fe2
4d408cc2f09fcc645d0da736b74f2f5cae86edc4
64a530cfa8e9be44965c9d708dfb642c2df2a59d
Change-Id: I7cd410861b28a0556de3375a0865a7baef52bd78
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/CustomTarget_soffice.mk | 6 | ||||
| -rw-r--r-- | desktop/Module_desktop.mk | 5 | ||||
| -rwxr-xr-x | desktop/scripts/soffice.sh | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk index 83b84ab49e2f..74eb6c9d6e3c 100644 --- a/desktop/CustomTarget_soffice.mk +++ b/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: diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index f043a6133148..cb067b3205c6 100644 --- a/desktop/Module_desktop.mk +++ b/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,\ diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index b0ba98d02b3b..a259bf69c854 100755 --- a/desktop/scripts/soffice.sh +++ b/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" "$@" |