summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'desktop')
-rw-r--r--desktop/scripts/soffice.sh53
-rw-r--r--desktop/source/migration/services/makefile.mk1
-rw-r--r--desktop/source/offacc/makefile.mk1
-rw-r--r--desktop/source/pagein/makefile.mk4
-rw-r--r--desktop/source/pkgchk/unopkg/makefile.mk18
-rw-r--r--desktop/source/splash/makefile.mk1
6 files changed, 28 insertions, 50 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 447c65866ea9..7895d3ed1cd9 100644
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -73,6 +73,31 @@ do
esac
done
+# pagein
+sd_pagein_args=@pagein-common
+for sd_arg in "$@"; do
+ case ${sd_arg} in
+ -calc)
+ sd_pagein_args="${sd_pagein_args} @pagein-calc"
+ break;
+ ;;
+ -draw)
+ sd_pagein_args="${sd_pagein_args} @pagein-draw"
+ break;
+ ;;
+ -impress)
+ sd_pagein_args="${sd_pagein_args} @pagein-impress"
+ break;
+ ;;
+ -writer)
+ sd_pagein_args="${sd_pagein_args} @pagein-writer"
+ break;
+ ;;
+ esac
+done
+"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \
+ ${sd_pagein_args}
+
# extend the ld_library_path for java: javaldx checks the sofficerc for us
if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
@@ -91,39 +116,11 @@ unset XENVIRONMENT
# uncomment line below if you encounter problems starting soffice on your system
# SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
-# pagein
-for sd_arg in ${1+"$@"} ; do
- case ${sd_arg} in
- -calc)
- sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-calc"
- break;
- ;;
- -draw)
- sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-draw"
- break;
- ;;
- -impress)
- sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-impress"
- break;
- ;;
- -writer)
- sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-writer"
- break;
- ;;
- *)
- ;;
- esac
-done
-
# read database entries for Adabas D
if [ -f /etc/adabasrc ]; then
. /etc/adabasrc
fi
-sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-common"
-"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \
- ${sd_pagein_args}
-
# Set PATH so that crash_report is found:
PATH=$sd_prog${PATH+:$PATH}
export PATH
diff --git a/desktop/source/migration/services/makefile.mk b/desktop/source/migration/services/makefile.mk
index 0eb70999e632..22d28ee00c73 100644
--- a/desktop/source/migration/services/makefile.mk
+++ b/desktop/source/migration/services/makefile.mk
@@ -70,7 +70,6 @@ SHL1STDLIBS= \
$(TOOLSLIB) \
$(I18NISOLANGLIB) \
$(JVMFWKLIB) \
- $(COMPHELPERLIB) \
$(XMLSCRIPTLIB) \
$(BERKELEYLIB)
diff --git a/desktop/source/offacc/makefile.mk b/desktop/source/offacc/makefile.mk
index ae804e63da2c..e269ec44d949 100644
--- a/desktop/source/offacc/makefile.mk
+++ b/desktop/source/offacc/makefile.mk
@@ -56,7 +56,6 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)
SHL1STDLIBS= \
- $(VCLLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALLIB)
diff --git a/desktop/source/pagein/makefile.mk b/desktop/source/pagein/makefile.mk
index 729d460b3652..85cbb4d3c9fd 100644
--- a/desktop/source/pagein/makefile.mk
+++ b/desktop/source/pagein/makefile.mk
@@ -53,12 +53,10 @@ OBJFILES= \
APP1TARGET=$(TARGET)
APP1OBJS=$(OBJFILES)
+APP1CODETYPE=C
# depends on libc only.
STDLIB=
-.IF "$(COMNAME)" == "sunpro5"
-STDLIB+=-library=no%Crun
-.ENDIF # sunpro5
# --- Targets ------------------------------------------------------
diff --git a/desktop/source/pkgchk/unopkg/makefile.mk b/desktop/source/pkgchk/unopkg/makefile.mk
index 96f9c6e0a771..3562fad961d9 100644
--- a/desktop/source/pkgchk/unopkg/makefile.mk
+++ b/desktop/source/pkgchk/unopkg/makefile.mk
@@ -51,13 +51,7 @@ CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
APP1TARGET = so$/unopkg
APP1OBJS = $(OBJFILES)
-APP1STDLIBS = $(SALLIB) $(UNOPKGAPPLIB) \
- $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) \
- $(UCBHELPERLIB) $(UNOTOOLSLIB) $(TOOLSLIB) $(VCLLIB) \
- $(DEPLOYMENTMISCLIB) $(BASEGFXLIB) $(I18NISOLANGLIB) \
- $(SOLTLIB) $(ICUUCLIB) $(ICUDATALIB) $(ICULELIB) \
- $(JVMACCESSLIB) $(XMLSCRIPTLIB) $(SALHELPERLIB) \
- $(VOSLIB) $(SOTLIB) $(I18NUTILLIB) $(BERKELEYLIB)
+APP1STDLIBS = $(SALLIB) $(UNOPKGAPPLIB)
APP1DEPN = $(SHL1TARGETN)
APP1NOSAL = TRUE
APP1RPATH = BRAND
@@ -68,14 +62,7 @@ APP1LINKRES = $(MISC)$/$(TARGET)1.res
APP2TARGET = unopkg
APP2OBJS = $(OBJFILES)
-APP2STDLIBS = $(SALLIB) $(UNOPKGAPPLIB) \
- $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) \
- $(UCBHELPERLIB) $(UNOTOOLSLIB) $(TOOLSLIB) \
- $(VCLLIB) $(BASEGFXLIB) $(I18NISOLANGLIB) \
- $(SOLTLIB) $(ICUUCLIB) $(ICUDATALIB) $(ICULELIB) \
- $(JVMACCESSLIB) $(SALHELPERLIB) \
- $(VOSLIB) $(SOTLIB) $(I18NUTILLIB) \
- $(DEPLOYMENTMISCLIB) $(BERKELEYLIB) $(XMLSCRIPTLIB)
+APP2STDLIBS = $(SALLIB) $(UNOPKGAPPLIB)
APP2DEPN = $(SHL1TARGETN)
APP2NOSAL = TRUE
APP2RPATH = BRAND
@@ -96,7 +83,6 @@ SHL1STDLIBS = \
$(TOOLSLIB) \
$(VCLLIB) \
$(DEPLOYMENTMISCLIB)
-
SHL1VERSIONMAP = version.map
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk
index e88fa6ad5a18..0447c0c2020e 100644
--- a/desktop/source/splash/makefile.mk
+++ b/desktop/source/splash/makefile.mk
@@ -69,7 +69,6 @@ SHL1STDLIBS= \
$(COMPHELPERLIB) \
$(UNOTOOLSLIB) \
$(TOOLSLIB) \
- $(VOSLIB) \
$(UCBHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
generated by cgit (git 2.34.1) at 2024-08-01 22:12:56 +0000