summaryrefslogtreecommitdiffstats
path: root/connectivity/source/dbtools
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/dbtools')
-rwxr-xr-x[-rw-r--r--]connectivity/source/dbtools/dbt.xml2
-rwxr-xr-x[-rw-r--r--]connectivity/source/dbtools/dbtools.component0
-rwxr-xr-x[-rw-r--r--]connectivity/source/dbtools/exports.dxp0
-rwxr-xr-x[-rw-r--r--]connectivity/source/dbtools/makefile.mk7
4 files changed, 3 insertions, 6 deletions
diff --git a/connectivity/source/dbtools/dbt.xml b/connectivity/source/dbtools/dbt.xml
index 8c5a3b916805..e2f8c8921c18 100644..100755
--- a/connectivity/source/dbtools/dbt.xml
+++ b/connectivity/source/dbtools/dbt.xml
@@ -5,11 +5,9 @@
<project-build-dependency>cppuhelper</project-build-dependency>
<project-build-dependency>cppu</project-build-dependency>
<project-build-dependency>sal</project-build-dependency>
- <project-build-dependency>vos</project-build-dependency>
<runtime-module-dependency>cppuhelper</runtime-module-dependency>
<runtime-module-dependency>cppu</runtime-module-dependency>
<runtime-module-dependency>sal</runtime-module-dependency>
- <runtime-module-dependency>vos</runtime-module-dependency>
<runtime-module-dependency>comphelper</runtime-module-dependency>
</module-description>
diff --git a/connectivity/source/dbtools/dbtools.component b/connectivity/source/dbtools/dbtools.component
index 08be953bb9d4..08be953bb9d4 100644..100755
--- a/connectivity/source/dbtools/dbtools.component
+++ b/connectivity/source/dbtools/dbtools.component
diff --git a/connectivity/source/dbtools/exports.dxp b/connectivity/source/dbtools/exports.dxp
index f0e1c69934bc..f0e1c69934bc 100644..100755
--- a/connectivity/source/dbtools/exports.dxp
+++ b/connectivity/source/dbtools/exports.dxp
diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk
index a73dae3d047d..90237153de77 100644..100755
--- a/connectivity/source/dbtools/makefile.mk
+++ b/connectivity/source/dbtools/makefile.mk
@@ -57,8 +57,8 @@ SHL1TARGET= $(DBTOOLS_TARGET)$(DLLPOSTFIX)
SHL1STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(JVMACCESSLIB) \
$(UNOTOOLSLIB) \
$(TOOLSLIB) \
@@ -67,12 +67,11 @@ SHL1STDLIBS=\
# NETBSD: somewhere we have to instantiate the static data members.
# NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
-# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
-.IF "$(OS)"=="NETBSD" || "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
+# MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
+.IF "$(OS)"=="NETBSD" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
SHL1STDLIBS+=$(UCBHELPERLIB)
.ENDIF
-#SHL1DEPN=
SHL1IMPLIB= idbtools
SHL1LIBS= $(LIB1TARGET)