remove tools from dbtools

15 files changed, 87 insertions, 69 deletions

diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk
index 7c1a77b60b19..72d9d470e0fa 100644
--- a/connectivity/source/drivers/adabas/makefile.mk
+++ b/connectivity/source/drivers/adabas/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: fs $ $Date: 2000-10-05 08:35:59 $
+#   last change: $Author: oj $ $Date: 2000-10-19 11:54:33 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -185,6 +185,7 @@ SHL1STDLIBS=\
     $(VOSLIB)					\
     $(OSLLIB)					\
     $(SALLIB)					\
+    $(DBTOOLSLIB)				\
     $(COMPHELPERLIB)
 
 .IF "$(COMPHELPERLIB)" == ""
@@ -193,9 +194,6 @@ SHL1STDLIBS+= icomphelp2.lib
 
 SHL1DEPN=
 SHL1IMPLIB=	i$(SHL1TARGET)
-SHL1LIBS=	$(SLB)$/commontools.lib	\
-            $(SLB)$/resource.lib	\
-            $(SLB)$/sdbcx.lib		
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk
index cf55453f9ffc..d96f235f7d97 100644
--- a/connectivity/source/drivers/ado/makefile.mk
+++ b/connectivity/source/drivers/ado/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: fs $ $Date: 2000-10-05 08:37:20 $
+#   last change: $Author: oj $ $Date: 2000-10-19 11:54:48 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -203,6 +203,7 @@ SHL1STDLIBS=\
     ole32.lib					\
     oleaut32.lib				\
     uuid.lib					\
+    $(DBTOOLSLIB)				\
     $(COMPHELPERLIB)
 
 .IF "$(COMPHELPERLIB)" == ""
@@ -211,11 +212,6 @@ SHL1STDLIBS+= icomphelp2.lib
 
 SHL1DEPN=
 SHL1IMPLIB=	i$(SHL1TARGET)
-SHL1LIBS=	$(SLB)$/$(TARGET).lib	\
-            $(SLB)$/commontools.lib	\
-            $(SLB)$/resource.lib	\
-            $(SLB)$/sdbcx.lib
-            
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 5dba20be9f62..164b5d12ba53 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dindexnode.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2000-09-29 15:28:55 $
+ *  last change: $Author: oj $ $Date: 2000-10-19 11:55:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,6 +71,9 @@
 #ifndef _CONNECTIVITY_DBASE_INDEX_HXX_
 #include "dbase/DIndex.hxx"
 #endif
+#ifndef _TOOLS_DEBUG_HXX
+#include <tools/debug.hxx>
+#endif
 
 
 using namespace connectivity;
diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk
index 9ea87e36349b..3c06aac9dc07 100644
--- a/connectivity/source/drivers/dbase/makefile.mk
+++ b/connectivity/source/drivers/dbase/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: oj $ $Date: 2000-10-09 12:30:30 $
+#   last change: $Author: oj $ $Date: 2000-10-19 11:55:55 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -121,7 +121,7 @@ SLOFILES+=$(SLO)$/staticmbdbase.obj
 
 # --- Library -----------------------------------
 
-SHL1TARGET=	$(DBASE_TARGET)$(DBASE_MAJOR)
+SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX)
 SHL1OBJS=$(SLOFILES)
 SHL1STDLIBS=\
     $(CPPULIB)					\
@@ -134,6 +134,7 @@ SHL1STDLIBS=\
     $(SVTOOLLIB)				\
     $(UCBHELPERLIB)				\
     $(SALLIB)					\
+    $(DBTOOLSLIB)				\
     $(COMPHELPERLIB)
 
 .IF "$(COMPHELPERLIB)" == ""
@@ -142,11 +143,7 @@ SHL1STDLIBS+= icomphelp2.lib
 
 SHL1DEPN=
 SHL1IMPLIB=	i$(DBASE_TARGET)
-SHL1LIBS=	$(SLB)$/commontools.lib	\
-            $(SLB)$/resource.lib	\
-            $(SLB)$/sdbcx.lib		\
-            $(SLB)$/file.lib		\
-            $(SLB)$/sql.lib	
+SHL1LIBS=	$(SLB)$/file.lib
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 57dcf3d78dd7..ce79275b080a 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FPreparedStatement.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2000-10-17 09:05:49 $
+ *  last change: $Author: oj $ $Date: 2000-10-19 11:56:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -120,7 +120,7 @@ void OPreparedStatement::disposing()
 // -------------------------------------------------------------------------
 void OPreparedStatement::construct(const ::rtl::OUString& sql)  throw(SQLException, RuntimeException)
 {
-    String aErr;
+    ::rtl::OUString aErr;
     m_pParseTree = m_aParser.parseTree(aErr,sql);
     if(m_pParseTree)
     {
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 96415aae7f5f..8e17d1fc1f39 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FResultSet.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: oj $ $Date: 2000-10-17 09:05:49 $
+ *  last change: $Author: oj $ $Date: 2000-10-19 11:56:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -101,6 +101,9 @@
 #ifndef _ITERATOR_
 #include <iterator>
 #endif
+#ifndef _TOOLS_DEBUG_HXX
+#include <tools/debug.hxx>
+#endif
 using namespace connectivity;
 using namespace connectivity::file;
 using namespace cppu;
@@ -2396,7 +2399,7 @@ void OResultSet::GetAssignValues()
             OSQLParseNode * pComp = pAssignment->getChild(1);
             OSL_ENSHURE(pComp != NULL,"OResultSet: pComp == NULL");
             OSL_ENSHURE(pComp->getNodeType() == SQL_NODE_EQUAL,"OResultSet: pComp->getNodeType() != SQL_NODE_COMPARISON");
-            if (pComp->getTokenValue().GetChar(0) != '=')
+            if (pComp->getTokenValue().toChar() != '=')
             {
                 //  aStatus.SetInvalidStatement();
                 throw SQLException();
@@ -2606,7 +2609,7 @@ void OResultSet::describeParameter()
         const OSQLTables& xTabs = m_aSQLIterator.getTables();
         OSQLTable xTable = xTabs.begin()->second;
 
-        String aTabName,aTmp,aColName,aParameterName;
+        ::rtl::OUString aTabName,aTmp,aColName,aParameterName;
         ::std::vector< OSQLParseNode*>::iterator aIter = aParseNodes.begin();
         for(;aIter != aParseNodes.end();++aIter)
         {
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index fee7ce3b784d..f21a410e077e 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FStatement.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-11 10:47:28 $
+ *  last change: $Author: oj $ $Date: 2000-10-19 11:56:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,6 +68,9 @@
 #ifndef _CONNECTIVITY_FILE_OCONNECTION_HXX_
 #include "file/FConnection.hxx"
 #endif
+#ifndef _CONNECTIVITY_FILE_ODRIVER_HXX_
+#include "file/FDriver.hxx"
+#endif
 #ifndef _CONNECTIVITY_FILE_ORESULTSET_HXX_
 #include "file/FResultSet.hxx"
 #endif
@@ -119,6 +122,7 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) :  OStatement_BASE(
     ,m_pConnection(_pConnection)
     ,m_pParseTree(NULL)
     ,m_aSQLIterator(_pConnection->createCatalog()->getTables(),_pConnection->getMetaData(),NULL)
+    ,m_aParser(_pConnection->getDriver()->getFactory())
 {
     m_pConnection->acquire();
 
@@ -262,7 +266,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const ::rtl::OUS
 
     Reference< XResultSet > xRS = NULL;
 
-    String aErr;
+    ::rtl::OUString aErr;
     m_pParseTree = m_aParser.parseTree(aErr,sql);
     if(m_pParseTree)
     {
@@ -298,7 +302,7 @@ sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const ::rtl::OUString& sql )
 
     Reference< XResultSet > xRS = NULL;
 
-    String aErr;
+    ::rtl::OUString aErr;
     m_pParseTree = m_aParser.parseTree(aErr,sql);
     if(m_pParseTree)
     {
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index c3a9d8fa81e0..834b53d5d28e 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fanalyzer.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-05 08:48:24 $
+ *  last change: $Author: oj $ $Date: 2000-10-19 11:56:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,10 +67,13 @@
 #ifndef _OSL_DIAGNOSE_H_
 #include <osl/diagnose.h>
 #endif
-
 #ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_
 #include <com/sun/star/container/XIndexAccess.hpp>
 #endif
+#ifndef _TOOLS_DEBUG_HXX
+#include <tools/debug.hxx>
+#endif
+
 
 using namespace connectivity;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index 6e785ac5e477..6bc7b8caaccb 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fcode.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2000-10-17 09:05:49 $
+ *  last change: $Author: oj $ $Date: 2000-10-19 11:56:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,6 +83,10 @@
 #ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_
 #include <com/sun/star/container/XIndexAccess.hpp>
 #endif
+#ifndef _TOOLS_DEBUG_HXX
+#include <tools/debug.hxx>
+#endif
+
 
 using namespace connectivity;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 5a8f1f0bcc91..55984c6e70f8 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fcomp.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-05 08:48:24 $
+ *  last change: $Author: oj $ $Date: 2000-10-19 11:56:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -358,7 +358,7 @@ OOperand* OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode)
             return NULL;
         }
         else
-            cEscape = pEscNode->getTokenValue().GetChar(0);
+            cEscape = pEscNode->getTokenValue().toChar();
     }
 
     OOperand* pOb = execute(pPredicateNode->getChild(0));
@@ -405,14 +405,14 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode)
 
     if (SQL_ISRULE(pPredicateNode,column_ref))
     {
-        String  aColumnName;
+        ::rtl::OUString aColumnName;
         if (pPredicateNode->count() == 1)
         {
             aColumnName = pPredicateNode->getChild(0)->getTokenValue();
         }
         else if (pPredicateNode->count() == 3)
         {
-            String aTableName = pPredicateNode->getChild(0)->getTokenValue();
+            ::rtl::OUString aTableName = pPredicateNode->getChild(0)->getTokenValue();
             aColumnName = pPredicateNode->getChild(2)->getTokenValue();
         }
 
@@ -448,7 +448,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode)
             (SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"+") || SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"-")) &&
             pPredicateNode->getChild(1)->getNodeType() == SQL_NODE_INTNUM)
     { // falls -1 bzw. +1 vorhanden ist
-        String aValue(pPredicateNode->getChild(0)->getTokenValue());
+        ::rtl::OUString aValue(pPredicateNode->getChild(0)->getTokenValue());
         aValue += pPredicateNode->getChild(1)->getTokenValue();
         pOperand = new OOperandConst(*pPredicateNode->getChild(1), aValue);
     }
diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx
index d6b8eb2eb5f9..69a6048c5936 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: EConnection.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2000-10-17 09:14:16 $
+ *  last change: $Author: oj $ $Date: 2000-10-19 11:55:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -139,13 +139,25 @@ void OFlatConnection::construct(const ::rtl::OUString& url,const Sequence< Prope
         else if(!pBegin->Name.compareToAscii("HeaderLine"))
             m_bHeaderLine = cppu::any2bool(pBegin->Value);
         else if(!pBegin->Name.compareToAscii("FieldDelimiter"))
-            pBegin->Value >>= m_cFieldDelimiter;
+        {
+            ::rtl::OUString aVal;
+            pBegin->Value >>= aVal; m_cFieldDelimiter = aVal.toChar();
+        }
         else if(!pBegin->Name.compareToAscii("StringDelimiter"))
-            pBegin->Value >>= m_cStringDelimiter;
+        {
+            ::rtl::OUString aVal;
+            pBegin->Value >>= aVal; m_cStringDelimiter = aVal.toChar();
+        }
         else if(!pBegin->Name.compareToAscii("DecimalDelimiter"))
-            pBegin->Value >>= m_cDecimalDelimiter;
+        {
+            ::rtl::OUString aVal;
+            pBegin->Value >>= aVal; m_cDecimalDelimiter = aVal.toChar();
+        }
         else if(!pBegin->Name.compareToAscii("ThousandDelimiter"))
-            pBegin->Value >>= m_cThousandDelimiter;
+        {
+            ::rtl::OUString aVal;
+            pBegin->Value >>= aVal; m_cThousandDelimiter = aVal.toChar();
+        }
     }
 
     osl_decrementInterlockedCount( &m_refCount );
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 12ff1a7043fb..11d71ae0ddb5 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ETable.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-11 10:46:43 $
+ *  last change: $Author: oj $ $Date: 2000-10-19 11:55:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -129,6 +129,9 @@
 #ifndef _ISOLANG_HXX
 #include <tools/isolang.hxx>
 #endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
 
 using namespace connectivity;
 using namespace connectivity::flat;
@@ -136,6 +139,7 @@ using namespace connectivity::file;
 using namespace ucb;
 using namespace comphelper;
 using namespace cppu;
+using namespace utl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::beans;
diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk
index 84d8bd942ad1..82b379c6f3be 100644
--- a/connectivity/source/drivers/flat/makefile.mk
+++ b/connectivity/source/drivers/flat/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: oj $ $Date: 2000-10-17 09:14:16 $
+#   last change: $Author: oj $ $Date: 2000-10-19 11:55:41 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -128,6 +128,7 @@ SHL1STDLIBS=\
     $(UNOTOOLSLIB)				\
     $(UCBHELPERLIB)				\
     $(SALLIB)					\
+    $(DBTOOLSLIB)				\
     $(COMPHELPERLIB)
 
 .IF "$(COMPHELPERLIB)" == ""
@@ -135,12 +136,8 @@ SHL1STDLIBS+= icomphelp2.lib
 .ENDIF
 
 SHL1DEPN=
-SHL1IMPLIB=	i$(FLAT_TARGET)
-SHL1LIBS=	$(SLB)$/commontools.lib	\
-            $(SLB)$/resource.lib	\
-            $(SLB)$/sdbcx.lib		\
-            $(SLB)$/file.lib		\
-            $(SLB)$/sql.lib	
+SHL1IMPLIB=	i$(TARGET)
+SHL1LIBS=	$(SLB)$/file.lib
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk
index 5f65625c8814..71fb2b2a149a 100644
--- a/connectivity/source/drivers/jdbc/makefile.mk
+++ b/connectivity/source/drivers/jdbc/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: fs $ $Date: 2000-10-05 08:40:12 $
+#   last change: $Author: oj $ $Date: 2000-10-19 11:55:08 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -175,6 +175,7 @@ SHL1STDLIBS=\
     $(VOSLIB)					\
     $(OSLLIB)					\
     $(SALLIB)					\
+    $(DBTOOLSLIB)				\
     $(COMPHELPERLIB)
 
 .IF "$(COMPHELPERLIB)" == ""
@@ -183,9 +184,6 @@ SHL1STDLIBS+= icomphelp2.lib
 
 SHL1DEPN=
 SHL1IMPLIB=	i$(SHL1TARGET)
-SHL1LIBS=	$(SLB)$/$(TARGET).lib	\
-            $(SLB)$/commontools.lib	\
-            $(SLB)$/resource.lib
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk
index 6059dfb79c8b..e681f5648746 100644
--- a/connectivity/source/drivers/odbc/makefile.mk
+++ b/connectivity/source/drivers/odbc/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: fs $ $Date: 2000-10-05 08:40:15 $
+#   last change: $Author: oj $ $Date: 2000-10-19 11:55:13 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -165,6 +165,7 @@ SHL1STDLIBS=\
     $(VOSLIB)					\
     $(OSLLIB)					\
     $(SALLIB)					\
+    $(DBTOOLSLIB)				\
     $(COMPHELPERLIB)
 
 .IF "$(COMPHELPERLIB)" == ""
@@ -173,8 +174,6 @@ SHL1STDLIBS+= icomphelp2.lib
 
 SHL1DEPN=
 SHL1IMPLIB=	i$(ODBC_TARGET)
-SHL1LIBS= $(SLB)$/commontools.lib	\
-            $(SLB)$/resource.lib	
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def