From cdf180a923d8d9f453a25199b2b49d8aa535af2d Mon Sep 17 00:00:00 2001 From: prabatuty Date: Sat, 4 Jun 2011 02:46:14 +0000 Subject: [PATCH] changes for libcsqlstorage and inclusion of libcsqlbase --- test/adapter/Connect/Makefile | 2 +- test/adapter/Parameter/Makefile | 2 +- test/adapter/Select/Makefile | 2 +- test/cache/FailOver/Makefile | 2 +- test/dbapi/Connection/Makefile | 2 +- test/dbapi/DataType/Makefile | 2 +- test/dbapi/DatabaseManager/Makefile | 2 +- test/dbapi/Index/Makefile | 2 +- test/dbapi/Predicate/Makefile | 2 +- test/dbapi/Table/Makefile | 2 +- test/dbapi/TableDef/Makefile | 2 +- test/dbapi/Threads/Makefile | 2 +- test/dbapi/UserManager/Makefile | 2 +- test/durability/checkpoint/Makefile | 2 +- test/durability/redologs/Makefile | 2 +- test/load/Makefile | 2 +- test/odbc/Adapter/Makefile | 4 ++-- test/odbc/Connect/Makefile | 4 ++-- test/odbc/Gateway/Makefile | 4 ++-- test/odbc/Metadata/Makefile | 4 ++-- test/odbc/NonSelectDML/Makefile | 4 ++-- test/odbc/Parameters/Makefile | 4 ++-- test/odbc/Select/Makefile | 4 ++-- test/odbc/Threads/Makefile | 2 +- test/odbc/Transaction/Makefile | 4 ++-- test/performance/Makefile | 2 +- test/performance/loadtest/Makefile | 2 +- test/soakTest/Makefile | 2 +- test/sql/DDL/Makefile | 2 +- test/sql/StmtCache/Makefile | 2 +- test/sqlapi/Connect/Makefile | 4 ++-- test/sqlapi/Csql/Connect/Makefile | 4 ++-- test/sqlapi/Csql/DDLStmt/Makefile | 4 ++-- test/sqlapi/Csql/DMLStmt/Makefile | 4 ++-- test/sqlapi/Csql/Isolation/Makefile | 4 ++-- test/sqlapi/Csql/ParamStmt/Makefile | 4 ++-- test/sqlapi/Parameter/Makefile | 4 ++-- test/sqlapi/Select/Makefile | 4 ++-- test/sqlgw/Parameter/Makefile | 2 +- test/sqlgw/Select/Makefile | 2 +- test/system/Allocator/Makefile | 2 +- test/system/config/Makefile | 2 +- test/system/lock/Makefile | 2 +- test/system/trans/Makefile | 2 +- test/tools/catalog/Makefile | 2 +- test/tools/csqldump/Makefile | 2 +- 46 files changed, 62 insertions(+), 62 deletions(-) diff --git a/test/adapter/Connect/Makefile b/test/adapter/Connect/Makefile index fed24824..1529781a 100644 --- a/test/adapter/Connect/Makefile +++ b/test/adapter/Connect/Makefile @@ -21,7 +21,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/install/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcsql -lcsqlsql -lcacheload -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcsqlstorage -lcsqlbase -lcsqlsql -lcacheload -lcsqlsqllog TARGETS = \ test001 conntest1na\ diff --git a/test/adapter/Parameter/Makefile b/test/adapter/Parameter/Makefile index f72b2138..bd39fc70 100644 --- a/test/adapter/Parameter/Makefile +++ b/test/adapter/Parameter/Makefile @@ -21,7 +21,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/install/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog TARGETS = \ test001 paratest1na\ diff --git a/test/adapter/Select/Makefile b/test/adapter/Select/Makefile index 0fc12a15..d2195ee2 100644 --- a/test/adapter/Select/Makefile +++ b/test/adapter/Select/Makefile @@ -20,7 +20,7 @@ ifeq ($(OSNAME), FreeBSD) endif INCL= -I$(CSQL_INSTALL_ROOT)/install/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog TARGETS = \ diff --git a/test/cache/FailOver/Makefile b/test/cache/FailOver/Makefile index 221b0c97..e93fefca 100644 --- a/test/cache/FailOver/Makefile +++ b/test/cache/FailOver/Makefile @@ -21,7 +21,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/install/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcacheload -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcacheload -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog TARGETS = \ diff --git a/test/dbapi/Connection/Makefile b/test/dbapi/Connection/Makefile index acf2facf..03494198 100644 --- a/test/dbapi/Connection/Makefile +++ b/test/dbapi/Connection/Makefile @@ -21,7 +21,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsql +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlstorage -lcsqlbase TARGETS = \ test001 test003 test004 test005 test006 test007 test008 \ diff --git a/test/dbapi/DataType/Makefile b/test/dbapi/DataType/Makefile index c0d772f7..7267640f 100644 --- a/test/dbapi/DataType/Makefile +++ b/test/dbapi/DataType/Makefile @@ -22,7 +22,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsql +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlstorage -lcsqlbase TARGETS = \ test001 test002 test003 test004 test005 test006 test007 \ diff --git a/test/dbapi/DatabaseManager/Makefile b/test/dbapi/DatabaseManager/Makefile index 1237409c..71c7381f 100644 --- a/test/dbapi/DatabaseManager/Makefile +++ b/test/dbapi/DatabaseManager/Makefile @@ -21,7 +21,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsql +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlstorage -lcsqlbase TARGETS = \ test001 diff --git a/test/dbapi/Index/Makefile b/test/dbapi/Index/Makefile index 7f9f3b32..7077ff8c 100644 --- a/test/dbapi/Index/Makefile +++ b/test/dbapi/Index/Makefile @@ -22,7 +22,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsql +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlstorage -lcsqlbase TARGETS = \ test001 \ diff --git a/test/dbapi/Predicate/Makefile b/test/dbapi/Predicate/Makefile index 0e86a824..d5d5bf85 100644 --- a/test/dbapi/Predicate/Makefile +++ b/test/dbapi/Predicate/Makefile @@ -22,7 +22,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsql +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlstorage -lcsqlbase TARGETS = \ test001 test001a test002 test002a\ diff --git a/test/dbapi/Table/Makefile b/test/dbapi/Table/Makefile index 198cdf31..b532cd5c 100644 --- a/test/dbapi/Table/Makefile +++ b/test/dbapi/Table/Makefile @@ -21,7 +21,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsql +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlstorage -lcsqlbase TARGETS = \ test001 \ diff --git a/test/dbapi/TableDef/Makefile b/test/dbapi/TableDef/Makefile index 3e00d2d7..a127dae1 100644 --- a/test/dbapi/TableDef/Makefile +++ b/test/dbapi/TableDef/Makefile @@ -21,7 +21,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsql +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlstorage -lcsqlbase TARGETS = \ test001 \ diff --git a/test/dbapi/Threads/Makefile b/test/dbapi/Threads/Makefile index 859d28a2..e0c7989b 100644 --- a/test/dbapi/Threads/Makefile +++ b/test/dbapi/Threads/Makefile @@ -22,7 +22,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsql +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlstorage -lcsqlbase TARGETS = noindex hash tree autoinc autoinchash autoinctree noindexvarchar hashvarchar treevarchar diff --git a/test/dbapi/UserManager/Makefile b/test/dbapi/UserManager/Makefile index 31669d07..2400655c 100644 --- a/test/dbapi/UserManager/Makefile +++ b/test/dbapi/UserManager/Makefile @@ -22,7 +22,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsql +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlstorage -lcsqlbase TARGETS = \ test001 diff --git a/test/durability/checkpoint/Makefile b/test/durability/checkpoint/Makefile index 6f6ee1db..aacdd0c6 100644 --- a/test/durability/checkpoint/Makefile +++ b/test/durability/checkpoint/Makefile @@ -21,7 +21,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsql -lcsqlfault +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlstorage -lcsqlbase -lcsqlfault TARGETS = takechkpt diff --git a/test/durability/redologs/Makefile b/test/durability/redologs/Makefile index 5a2b1fbb..382b78d3 100644 --- a/test/durability/redologs/Makefile +++ b/test/durability/redologs/Makefile @@ -23,7 +23,7 @@ endif JAVAC = javac -g:none INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlsql -lcsqlsqllog -lcsql -lcsqlnw -lcsqlodbcadapter -lcsqlfault +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlsql -lcsqlsqllog -lcsqlstorage -lcsqlbase -lcsqlnw -lcsqlodbcadapter -lcsqlfault TARGETS = stmtTest3 stmtTest5 stmtTest6 stmtTest7 stmtTest8 stmtTest9 diff --git a/test/load/Makefile b/test/load/Makefile index e1605528..2cec21dc 100644 --- a/test/load/Makefile +++ b/test/load/Makefile @@ -25,7 +25,7 @@ endif JAVAC = javac -g:none INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../include -LIBS= -L/home/prabatuty/myroot/lib -L$(CSQL_INSTALL_ROOT)/lib -L/usr/local/lib -lcsqlsql -lcsqlsqllog -lcsql -lcsqlnw -lodbc -lcsqlgw -lcacheload -lcsqlsqlnw -lcsqlodbcadapter +LIBS= -L/home/prabatuty/myroot/lib -L$(CSQL_INSTALL_ROOT)/lib -L/usr/local/lib -lcsqlsql -lcsqlsqllog -lcsqlstorage -lcsqlbase -lcsqlnw -lodbc -lcsqlgw -lcacheload -lcsqlsqlnw -lcsqlodbcadapter TARGETS = \ SQLAdapterTest diff --git a/test/odbc/Adapter/Makefile b/test/odbc/Adapter/Makefile index 3e3db348..3b70c175 100644 --- a/test/odbc/Adapter/Makefile +++ b/test/odbc/Adapter/Makefile @@ -22,9 +22,9 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include ifeq ($(BUILDTYPE), MMDB) -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlnw -lcsqlsqlnw -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlnw -lcsqlsqlnw -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog else -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcacheload -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcacheload -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog endif TARGETS = test001b test001c \ diff --git a/test/odbc/Connect/Makefile b/test/odbc/Connect/Makefile index 0d27192e..caecff1c 100644 --- a/test/odbc/Connect/Makefile +++ b/test/odbc/Connect/Makefile @@ -22,9 +22,9 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include ifeq ($(BUILDTYPE), MMDB) -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlnw -lcsqlsqlnw -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlnw -lcsqlsqlnw -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog else -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcacheload -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcacheload -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog endif ifeq ($(BUILDTYPE), MMDB) diff --git a/test/odbc/Gateway/Makefile b/test/odbc/Gateway/Makefile index 8e59aa8e..c0931ae3 100644 --- a/test/odbc/Gateway/Makefile +++ b/test/odbc/Gateway/Makefile @@ -22,9 +22,9 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include ifeq ($(BUILDTYPE), MMDB) -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlnw -lcsqlsqlnw -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlnw -lcsqlsqlnw -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog else -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcacheload -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcacheload -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog endif TARGETS = test001d test001e \ diff --git a/test/odbc/Metadata/Makefile b/test/odbc/Metadata/Makefile index 6c3087c2..e1b53bf6 100644 --- a/test/odbc/Metadata/Makefile +++ b/test/odbc/Metadata/Makefile @@ -22,9 +22,9 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include ifeq ($(BUILDTYPE), MMDB) -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlnw -lcsqlsqlnw -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlnw -lcsqlsqlnw -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog else -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcacheload -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcacheload -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog endif ifeq ($(BUILDTYPE), MMDB) diff --git a/test/odbc/NonSelectDML/Makefile b/test/odbc/NonSelectDML/Makefile index 5b884332..83d9f39a 100644 --- a/test/odbc/NonSelectDML/Makefile +++ b/test/odbc/NonSelectDML/Makefile @@ -22,9 +22,9 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include ifeq ($(BUILDTYPE), MMDB) -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlnw -lcsqlsqlnw -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlnw -lcsqlsqlnw -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog else -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcacheload -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcacheload -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog endif ifeq ($(BUILDTYPE), MMDB) diff --git a/test/odbc/Parameters/Makefile b/test/odbc/Parameters/Makefile index e364961c..efa037df 100644 --- a/test/odbc/Parameters/Makefile +++ b/test/odbc/Parameters/Makefile @@ -22,9 +22,9 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include ifeq ($(BUILDTYPE), MMDB) -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlnw -lcsqlsqlnw -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlnw -lcsqlsqlnw -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog else -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcacheload -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcacheload -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog endif ifeq ($(BUILDTYPE), MMDB) diff --git a/test/odbc/Select/Makefile b/test/odbc/Select/Makefile index 81e2c851..7002b52f 100644 --- a/test/odbc/Select/Makefile +++ b/test/odbc/Select/Makefile @@ -22,9 +22,9 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include ifeq ($(BUILDTYPE), MMDB) -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlnw -lcsqlsqlnw -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlnw -lcsqlsqlnw -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog else -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcacheload -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcacheload -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog endif diff --git a/test/odbc/Threads/Makefile b/test/odbc/Threads/Makefile index aadcbe77..0572266d 100644 --- a/test/odbc/Threads/Makefile +++ b/test/odbc/Threads/Makefile @@ -22,7 +22,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../include -LIBS= -L/home/prabatuty/myroot/lib -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlsql -lcsqlsqllog -lcsql -lcsqlnw -lodbc -lcsqlgw -lcacheload +LIBS= -L/home/prabatuty/myroot/lib -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlsql -lcsqlsqllog -lcsqlstorage -lcsqlbase -lcsqlnw -lodbc -lcsqlgw -lcacheload TARGETS = \ test001 test002 test003 diff --git a/test/odbc/Transaction/Makefile b/test/odbc/Transaction/Makefile index 411524d0..7a7e833e 100644 --- a/test/odbc/Transaction/Makefile +++ b/test/odbc/Transaction/Makefile @@ -22,9 +22,9 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include ifeq ($(BUILDTYPE), MMDB) -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlnw -lcsqlsqlnw -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlnw -lcsqlsqlnw -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog else -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcacheload -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcacheload -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog endif diff --git a/test/performance/Makefile b/test/performance/Makefile index d5f3f53f..e4186bd7 100644 --- a/test/performance/Makefile +++ b/test/performance/Makefile @@ -23,7 +23,7 @@ endif JAVAC = javac -g:none INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../include -LIBS= -L/home/prabatuty/myroot/lib -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlsql -lcsqlsqllog -lcsql -lcsqlnw -lodbc -lcsqlgw -lcacheload +LIBS= -L/home/prabatuty/myroot/lib -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlsql -lcsqlsqllog -lcsqlstorage -lcsqlbase -lcsqlnw -lodbc -lcsqlgw -lcacheload TARGETS = \ SQLGWTest \ diff --git a/test/performance/loadtest/Makefile b/test/performance/loadtest/Makefile index 79ebdabb..97671fd1 100644 --- a/test/performance/loadtest/Makefile +++ b/test/performance/loadtest/Makefile @@ -21,7 +21,7 @@ endif endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../include -LIBS= -L/home/prabatuty/myroot/lib -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlsql -lcsqlsqllog -lcsql -lcsqlnw -lodbc -lcsqlgw -lcacheload +LIBS= -L/home/prabatuty/myroot/lib -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlsql -lcsqlsqllog -lcsqlstorage -lcsqlbase -lcsqlnw -lodbc -lcsqlgw -lcacheload #LIBS= -L/home/prabatuty/myroot/lib -L$(CSQL_INSTALL_ROOT)/lib -lodbc TARGETS = \ diff --git a/test/soakTest/Makefile b/test/soakTest/Makefile index e1c9dfaf..8bd991e5 100644 --- a/test/soakTest/Makefile +++ b/test/soakTest/Makefile @@ -23,7 +23,7 @@ endif JAVAC = javac -g:none INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlsql -lcsqlsqllog -lcsql -lcsqlnw -lcsqlodbcadapter +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlsql -lcsqlsqllog -lcsqlstorage -lcsqlbase -lcsqlnw -lcsqlodbcadapter TARGETS = \ csqlInsert \ diff --git a/test/sql/DDL/Makefile b/test/sql/DDL/Makefile index b2d39524..d389077d 100644 --- a/test/sql/DDL/Makefile +++ b/test/sql/DDL/Makefile @@ -23,7 +23,7 @@ endif JAVAC = javac -g:none INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlsql -lcsqlsqllog -lcsql -lcsqlnw -lcsqlodbcadapter +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlsql -lcsqlsqllog -lcsqlstorage -lcsqlbase -lcsqlnw -lcsqlodbcadapter TARGETS = test004 diff --git a/test/sql/StmtCache/Makefile b/test/sql/StmtCache/Makefile index 59f888f9..9a23d4bc 100644 --- a/test/sql/StmtCache/Makefile +++ b/test/sql/StmtCache/Makefile @@ -23,7 +23,7 @@ endif JAVAC = javac -g:none INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlsql -lcsqlsqllog -lcsql -lcsqlnw -lcsqlodbcadapter -lcsqlfault +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlodbc -lcsqlsql -lcsqlsqllog -lcsqlstorage -lcsqlbase -lcsqlnw -lcsqlodbcadapter -lcsqlfault TARGETS = test002 stmtTest3 test004 stmtTest5 stmtTest6 stmtTest7 stmtTest8 \ stmtTest9 stmtTest10 stmtTest11 test012 test013 test013a test013b diff --git a/test/sqlapi/Connect/Makefile b/test/sqlapi/Connect/Makefile index 728e75a7..9305385b 100644 --- a/test/sqlapi/Connect/Makefile +++ b/test/sqlapi/Connect/Makefile @@ -22,9 +22,9 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/install/include -I../../../include ifeq ($(BUILDTYPE), MMDB) -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsql -lcsqlsqllog -lcsqlnw -lcsqlsqlnw -lcsqlsqlnw +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsqlstorage -lcsqlbase -lcsqlsqllog -lcsqlnw -lcsqlsqlnw -lcsqlsqlnw else -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsql -lcsqlsqllog -lcsqlnw -lcacheload -lcsqlsqlnw -lcsqlgw -lcsqlsqlnw -lcsqlodbcadapter +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsqlstorage -lcsqlbase -lcsqlsqllog -lcsqlnw -lcacheload -lcsqlsqlnw -lcsqlgw -lcsqlsqlnw -lcsqlodbcadapter endif TARGETS = \ diff --git a/test/sqlapi/Csql/Connect/Makefile b/test/sqlapi/Csql/Connect/Makefile index 8f296bf6..0c41d724 100644 --- a/test/sqlapi/Csql/Connect/Makefile +++ b/test/sqlapi/Csql/Connect/Makefile @@ -22,9 +22,9 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/install/include -I../../../../include ifeq ($(BUILDTYPE), MMDB) -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsql -lcsqlsqllog -lcsqlnw -lcsqlsqlnw -lcsqlsqlnw +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsqlstorage -lcsqlbase -lcsqlsqllog -lcsqlnw -lcsqlsqlnw -lcsqlsqlnw else -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsql -lcsqlsqllog -lcsqlnw -lcacheload -lcsqlsqlnw -lcsqlgw -lcsqlsqlnw -lcsqlodbcadapter +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsqlstorage -lcsqlbase -lcsqlsqllog -lcsqlnw -lcacheload -lcsqlsqlnw -lcsqlgw -lcsqlsqlnw -lcsqlodbcadapter endif TARGETS = \ diff --git a/test/sqlapi/Csql/DDLStmt/Makefile b/test/sqlapi/Csql/DDLStmt/Makefile index fb9542b5..2dc8c2ed 100644 --- a/test/sqlapi/Csql/DDLStmt/Makefile +++ b/test/sqlapi/Csql/DDLStmt/Makefile @@ -22,9 +22,9 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/install/include -I../../../../include ifeq ($(BUILDTYPE), MMDB) -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsql -lcsqlsqllog -lcsqlnw -lcsqlsqlnw +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsqlstorage -lcsqlbase -lcsqlsqllog -lcsqlnw -lcsqlsqlnw else -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsql -lcsqlsqllog -lcsqlnw -lcacheload -lcsqlsqlnw -lcsqlgw -lcsqlodbcadapter +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsqlstorage -lcsqlbase -lcsqlsqllog -lcsqlnw -lcacheload -lcsqlsqlnw -lcsqlgw -lcsqlodbcadapter endif TARGETS = \ diff --git a/test/sqlapi/Csql/DMLStmt/Makefile b/test/sqlapi/Csql/DMLStmt/Makefile index 55b341d1..eb361074 100644 --- a/test/sqlapi/Csql/DMLStmt/Makefile +++ b/test/sqlapi/Csql/DMLStmt/Makefile @@ -22,9 +22,9 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/install/include -I../../../../include ifeq ($(BUILDTYPE), MMDB) -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsql -lcsqlsqllog -lcsqlnw -lcsqlsqlnw +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsqlstorage -lcsqlbase -lcsqlsqllog -lcsqlnw -lcsqlsqlnw else -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsql -lcsqlsqllog -lcsqlnw -lcacheload -lcsqlsqlnw -lcsqlgw -lcsqlodbcadapter +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsqlstorage -lcsqlbase -lcsqlsqllog -lcsqlnw -lcacheload -lcsqlsqlnw -lcsqlgw -lcsqlodbcadapter endif TARGETS = \ diff --git a/test/sqlapi/Csql/Isolation/Makefile b/test/sqlapi/Csql/Isolation/Makefile index 082d710b..d893034e 100644 --- a/test/sqlapi/Csql/Isolation/Makefile +++ b/test/sqlapi/Csql/Isolation/Makefile @@ -22,9 +22,9 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../../include ifeq ($(BUILDTYPE), MMDB) -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsql -lcsqlsqllog -lcsqlnw -lcsqlsqlnw -lcsqlsqlnw +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsqlstorage -lcsqlbase -lcsqlsqllog -lcsqlnw -lcsqlsqlnw -lcsqlsqlnw else -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsql -lcsqlsqllog -lcsqlnw -lcacheload -lcsqlsqlnw -lcsqlgw -lcsqlsqlnw -lcsqlodbcadapter +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsqlstorage -lcsqlbase -lcsqlsqllog -lcsqlnw -lcacheload -lcsqlsqlnw -lcsqlgw -lcsqlsqlnw -lcsqlodbcadapter endif TARGETS = \ diff --git a/test/sqlapi/Csql/ParamStmt/Makefile b/test/sqlapi/Csql/ParamStmt/Makefile index 45ee9f2c..18ff4b6b 100644 --- a/test/sqlapi/Csql/ParamStmt/Makefile +++ b/test/sqlapi/Csql/ParamStmt/Makefile @@ -22,9 +22,9 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/install/include -I../../../../include ifeq ($(BUILDTYPE), MMDB) -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsql -lcsqlsqllog -lcsqlnw -lcsqlsqlnw +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsqlstorage -lcsqlbase -lcsqlsqllog -lcsqlnw -lcsqlsqlnw else -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsql -lcsqlsqllog -lcsqlnw -lcacheload -lcsqlsqlnw -lcsqlgw -lcsqlodbcadapter +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsqlstorage -lcsqlbase -lcsqlsqllog -lcsqlnw -lcacheload -lcsqlsqlnw -lcsqlgw -lcsqlodbcadapter endif TARGETS = \ diff --git a/test/sqlapi/Parameter/Makefile b/test/sqlapi/Parameter/Makefile index 63eb8fd7..6a0b56bb 100644 --- a/test/sqlapi/Parameter/Makefile +++ b/test/sqlapi/Parameter/Makefile @@ -22,9 +22,9 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/install/include -I../../../include ifeq ($(BUILDTYPE), MMDB) -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsql -lcsqlsqllog -lcsqlnw -lcsqlsqlnw +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsqlstorage -lcsqlbase -lcsqlsqllog -lcsqlnw -lcsqlsqlnw else -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsql -lcsqlsqllog -lcsqlnw -lcacheload -lcsqlsqlnw -lcsqlgw -lcsqlodbcadapter +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsqlstorage -lcsqlbase -lcsqlsqllog -lcsqlnw -lcacheload -lcsqlsqlnw -lcsqlgw -lcsqlodbcadapter endif TARGETS = \ diff --git a/test/sqlapi/Select/Makefile b/test/sqlapi/Select/Makefile index 8d50c2ef..fe1cf3cd 100644 --- a/test/sqlapi/Select/Makefile +++ b/test/sqlapi/Select/Makefile @@ -22,9 +22,9 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/install/include -I../../../include ifeq ($(BUILDTYPE), MMDB) -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsql -lcsqlsqllog -lcsqlnw -lcsqlsqlnw +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsqlstorage -lcsqlbase -lcsqlsqllog -lcsqlnw -lcsqlsqlnw else -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsql -lcsqlsqllog -lcsqlnw -lcacheload -lcsqlsqlnw -lcsqlgw -lcsqlodbcadapter +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlsql -lcsqlstorage -lcsqlbase -lcsqlsqllog -lcsqlnw -lcacheload -lcsqlsqlnw -lcsqlgw -lcsqlodbcadapter endif TARGETS = \ diff --git a/test/sqlgw/Parameter/Makefile b/test/sqlgw/Parameter/Makefile index 8cfb7810..91a78066 100644 --- a/test/sqlgw/Parameter/Makefile +++ b/test/sqlgw/Parameter/Makefile @@ -21,7 +21,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/install/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog TARGETS = \ paratest1 paratest2 paratest3 paratest4 paratest5 paratest6 diff --git a/test/sqlgw/Select/Makefile b/test/sqlgw/Select/Makefile index acf75064..bbc78736 100644 --- a/test/sqlgw/Select/Makefile +++ b/test/sqlgw/Select/Makefile @@ -21,7 +21,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/install/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsql -lcsqlsql -lcsqlsqllog +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlgw -lcsqlnw -lcsqlodbcadapter -lcsqlsqlnw -lcacheload -lcsqlstorage -lcsqlbase -lcsqlsql -lcsqlsqllog TARGETS = \ diff --git a/test/system/Allocator/Makefile b/test/system/Allocator/Makefile index 1a5768d4..c2a93eea 100644 --- a/test/system/Allocator/Makefile +++ b/test/system/Allocator/Makefile @@ -21,7 +21,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsql +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlstorage -lcsqlbase TARGETS = \ create createNoIndex drop \ diff --git a/test/system/config/Makefile b/test/system/config/Makefile index 785d6b8d..3a4c0c42 100644 --- a/test/system/config/Makefile +++ b/test/system/config/Makefile @@ -21,7 +21,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsql +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlstorage -lcsqlbase TARGETS = \ connect \ diff --git a/test/system/lock/Makefile b/test/system/lock/Makefile index 3e06e334..35bd0d44 100644 --- a/test/system/lock/Makefile +++ b/test/system/lock/Makefile @@ -21,7 +21,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsql +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlstorage -lcsqlbase TARGETS = \ test001 test001a \ diff --git a/test/system/trans/Makefile b/test/system/trans/Makefile index de7dbec2..be8f3e10 100644 --- a/test/system/trans/Makefile +++ b/test/system/trans/Makefile @@ -21,7 +21,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsql +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlstorage -lcsqlbase TARGETS = \ create drop \ diff --git a/test/tools/catalog/Makefile b/test/tools/catalog/Makefile index 643198ff..9ffb0500 100644 --- a/test/tools/catalog/Makefile +++ b/test/tools/catalog/Makefile @@ -21,7 +21,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsql +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlstorage -lcsqlbase TARGETS = \ create drop insert diff --git a/test/tools/csqldump/Makefile b/test/tools/csqldump/Makefile index 33e138ba..23b4e68e 100644 --- a/test/tools/csqldump/Makefile +++ b/test/tools/csqldump/Makefile @@ -21,7 +21,7 @@ endif INCL= -I$(CSQL_INSTALL_ROOT)/include -I../../../include -LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsql +LIBS= -L$(CSQL_INSTALL_ROOT)/lib -lcsqlstorage -lcsqlbase TARGETS = \ insert -- 2.11.4.GIT