From 63f397a4d1726d42a2223ebb5dc972568b9de4ca Mon Sep 17 00:00:00 2001 From: prabatuty Date: Sat, 4 Jun 2011 02:42:59 +0000 Subject: [PATCH] changing libcsql.so library name to libcsqlstorage.so --- src/jdbc/Makefile.am | 3 ++- src/odbc/Makefile.am | 3 ++- src/server/Makefile.am | 10 +++++----- src/server/Makefile.am.full | 10 +++++----- src/server/Makefile.am.mmdb | 6 +++--- src/storage/Makefile.am | 6 +++--- src/tools/Makefile.am | 22 +++++++++++----------- src/tools/Makefile.am.full | 22 +++++++++++----------- src/tools/Makefile.am.mmdb | 12 ++++++------ 9 files changed, 48 insertions(+), 46 deletions(-) diff --git a/src/jdbc/Makefile.am b/src/jdbc/Makefile.am index 7fab87a9..4e1faea0 100644 --- a/src/jdbc/Makefile.am +++ b/src/jdbc/Makefile.am @@ -2,7 +2,8 @@ INCLUDES = -I$(top_srcdir)/include $(all_includes) -I$(top_srcdir)/src/sql METASOURCES = AUTO lib_LTLIBRARIES = libcsqljdbc.la libcsqljdbc_la_LDFLAGS = -avoid-version -module \ - -L$(top_srcdir)/src/storage -lcsql \ + -L$(top_srcdir)/src/base -lcsqlbase \ + -L$(top_srcdir)/src/storage -lcsqlstorage \ -L$(top_srcdir)/src/network -lcsqlnw \ -L$(top_srcdir)/src/sql -lcsqlsql \ -L$(top_srcdir)/src/sqlnetwork -lcsqlsqlnw \ diff --git a/src/odbc/Makefile.am b/src/odbc/Makefile.am index a8aa3c0e..7c9253d0 100644 --- a/src/odbc/Makefile.am +++ b/src/odbc/Makefile.am @@ -2,7 +2,8 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/sql -I$(top_srcdir)/inclu METASOURCES = AUTO lib_LTLIBRARIES = libcsqlodbc.la libcsqlodbc_la_LDFLAGS = -avoid-version -module \ - -L$(top_srcdir)/src/storage -lcsql \ + -L$(top_srcdir)/src/base -lcsqlbase \ + -L$(top_srcdir)/src/storage -lcsqlstorage \ -L$(top_srcdir)/src/network -lcsqlnw \ -L$(top_srcdir)/src/sql -lcsqlsql \ -L$(top_srcdir)/src/sqlnetwork -lcsqlsqlnw \ diff --git a/src/server/Makefile.am b/src/server/Makefile.am index dc150a17..7ada7994 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/include $(all_includes) -I$(top_srcdir)/src/sql METASOURCES = AUTO bin_PROGRAMS = csqlserver csqlsqlserver csqlcacheserver csqlasyncserver csqlcheckpointserver -csqlserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ +csqlserver_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -23,7 +23,7 @@ csqlasyncserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ - $(top_builddir)/src/storage/libcsql.la + $(top_builddir)/src/storage/libcsqlstorage.la csqlasyncserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl csqlasyncserver_SOURCES = csqlasyncserver.cxx @@ -36,11 +36,11 @@ csqlsqlserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ - $(top_builddir)/src/storage/libcsql.la + $(top_builddir)/src/storage/libcsqlstorage.la csqlsqlserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl csqlsqlserver_SOURCES = csqlsqlserver.cxx -csqlcacheserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ +csqlcacheserver_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -52,7 +52,7 @@ csqlcacheserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ csqlcacheserver_LDFLAGS = -lcrypt -lodbc -lrt -lpthread -ldl csqlcacheserver_SOURCES = csqlcacheserver.cxx -csqlcheckpointserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ +csqlcheckpointserver_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ diff --git a/src/server/Makefile.am.full b/src/server/Makefile.am.full index dc150a17..7ada7994 100644 --- a/src/server/Makefile.am.full +++ b/src/server/Makefile.am.full @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/include $(all_includes) -I$(top_srcdir)/src/sql METASOURCES = AUTO bin_PROGRAMS = csqlserver csqlsqlserver csqlcacheserver csqlasyncserver csqlcheckpointserver -csqlserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ +csqlserver_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -23,7 +23,7 @@ csqlasyncserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ - $(top_builddir)/src/storage/libcsql.la + $(top_builddir)/src/storage/libcsqlstorage.la csqlasyncserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl csqlasyncserver_SOURCES = csqlasyncserver.cxx @@ -36,11 +36,11 @@ csqlsqlserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ - $(top_builddir)/src/storage/libcsql.la + $(top_builddir)/src/storage/libcsqlstorage.la csqlsqlserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl csqlsqlserver_SOURCES = csqlsqlserver.cxx -csqlcacheserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ +csqlcacheserver_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -52,7 +52,7 @@ csqlcacheserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ csqlcacheserver_LDFLAGS = -lcrypt -lodbc -lrt -lpthread -ldl csqlcacheserver_SOURCES = csqlcacheserver.cxx -csqlcheckpointserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ +csqlcheckpointserver_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ diff --git a/src/server/Makefile.am.mmdb b/src/server/Makefile.am.mmdb index 03fe2253..d5699842 100644 --- a/src/server/Makefile.am.mmdb +++ b/src/server/Makefile.am.mmdb @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/include $(all_includes) -I$(top_srcdir)/src/sql METASOURCES = AUTO bin_PROGRAMS = csqlserver csqlsqlserver csqlcheckpointserver -csqlserver_LDADD = $(top_builddir)/src/storage/libcsql.la +csqlserver_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la csqlserver_LDFLAGS = -lcrypt -lrt -lpthread -ldl csqlserver_SOURCES = csqlserver.cxx @@ -11,11 +11,11 @@ csqlsqlserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ $(top_builddir)/src/network/libcsqlnw.la \ - $(top_builddir)/src/storage/libcsql.la + $(top_builddir)/src/storage/libcsqlstorage.la csqlsqlserver_LDFLAGS = -lcrypt -lrt -lpthread -ldl csqlsqlserver_SOURCES = csqlsqlserver.cxx -csqlcheckpointserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ +csqlcheckpointserver_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ diff --git a/src/storage/Makefile.am b/src/storage/Makefile.am index 8442ddbf..1763d6e6 100644 --- a/src/storage/Makefile.am +++ b/src/storage/Makefile.am @@ -1,8 +1,8 @@ INCLUDES = -I$(top_srcdir)/include $(all_includes) METASOURCES = AUTO -lib_LTLIBRARIES = libcsql.la -libcsql_la_LDFLAGS = -avoid-version -module -libcsql_la_SOURCES = BucketIter.cxx TreeIter.cxx BucketList.cxx \ +lib_LTLIBRARIES = libcsqlstorage.la +libcsqlstorage_la_LDFLAGS = -avoid-version -module +libcsqlstorage_la_SOURCES = BucketIter.cxx TreeIter.cxx BucketList.cxx \ Chunk.cxx VarChunk.cxx \ CatalogTables.cxx CatalogTablesIdx.cxx CatalogTablesFk.cxx \ ChunkIterator.cxx Condition.cxx Connection.cxx Database.cxx \ diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index c05429c3..c6d40cda 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO bin_PROGRAMS = csql icsql catalog cachetable csqldump cacheverify redo recover checkpoint csqlds applyofflinelogs csql_SOURCES = isql.cxx -csql_LDADD = $(top_builddir)/src/storage/libcsql.la \ +csql_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -16,7 +16,7 @@ csql_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -lreadline -lcurses -ldl icsql_SOURCES = isql.cxx icsql_CPPFLAGS = -DNO_READLINE_LIB -icsql_LDADD = $(top_builddir)/src/storage/libcsql.la \ +icsql_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -29,7 +29,7 @@ icsql_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl redo_SOURCES = redo.cxx -redo_LDADD = $(top_builddir)/src/storage/libcsql.la \ +redo_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -41,7 +41,7 @@ redo_LDADD = $(top_builddir)/src/storage/libcsql.la \ redo_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -lreadline -lcurses -ldl applyofflinelogs_SOURCES = applyofflinelogs.cxx -applyofflinelogs_LDADD = $(top_builddir)/src/storage/libcsql.la \ +applyofflinelogs_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -53,7 +53,7 @@ applyofflinelogs_LDADD = $(top_builddir)/src/storage/libcsql.la \ applyofflinelogs_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl recover_SOURCES = recover.cxx -recover_LDADD = $(top_builddir)/src/storage/libcsql.la \ +recover_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -65,7 +65,7 @@ recover_LDADD = $(top_builddir)/src/storage/libcsql.la \ recover_LDFLAGS = -lcrypt -lrt -lpthread -lodbc -ldl checkpoint_SOURCES = checkpoint.cxx -checkpoint_LDADD = $(top_builddir)/src/storage/libcsql.la \ +checkpoint_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -77,7 +77,7 @@ checkpoint_LDADD = $(top_builddir)/src/storage/libcsql.la \ checkpoint_LDFLAGS = -lcrypt -lrt -lpthread -lcrypt -lodbc -ldl catalog_SOURCES = catalog.cxx -catalog_LDADD = $(top_builddir)/src/storage/libcsql.la \ +catalog_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -88,7 +88,7 @@ catalog_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la catalog_LDFLAGS = -lcrypt -lrt -ldl -cachetable_LDADD = $(top_builddir)/src/storage/libcsql.la \ +cachetable_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -109,7 +109,7 @@ cacheverify_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/storage/libcsql.la + $(top_builddir)/src/storage/libcsqlstorage.la cacheverify_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl cacheverify_SOURCES = cacheverify.cxx @@ -122,11 +122,11 @@ csqldump_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ - $(top_builddir)/src/storage/libcsql.la + $(top_builddir)/src/storage/libcsqlstorage.la csqldump_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl csqldump_SOURCES = csqldump.cxx -csqlds_LDADD = $(top_builddir)/src/storage/libcsql.la \ +csqlds_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la csqlds_LDFLAGS = -lcrypt -ldl csqlds_SOURCES = csqlds.cxx diff --git a/src/tools/Makefile.am.full b/src/tools/Makefile.am.full index c05429c3..c6d40cda 100644 --- a/src/tools/Makefile.am.full +++ b/src/tools/Makefile.am.full @@ -3,7 +3,7 @@ METASOURCES = AUTO bin_PROGRAMS = csql icsql catalog cachetable csqldump cacheverify redo recover checkpoint csqlds applyofflinelogs csql_SOURCES = isql.cxx -csql_LDADD = $(top_builddir)/src/storage/libcsql.la \ +csql_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -16,7 +16,7 @@ csql_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -lreadline -lcurses -ldl icsql_SOURCES = isql.cxx icsql_CPPFLAGS = -DNO_READLINE_LIB -icsql_LDADD = $(top_builddir)/src/storage/libcsql.la \ +icsql_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -29,7 +29,7 @@ icsql_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl redo_SOURCES = redo.cxx -redo_LDADD = $(top_builddir)/src/storage/libcsql.la \ +redo_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -41,7 +41,7 @@ redo_LDADD = $(top_builddir)/src/storage/libcsql.la \ redo_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -lreadline -lcurses -ldl applyofflinelogs_SOURCES = applyofflinelogs.cxx -applyofflinelogs_LDADD = $(top_builddir)/src/storage/libcsql.la \ +applyofflinelogs_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -53,7 +53,7 @@ applyofflinelogs_LDADD = $(top_builddir)/src/storage/libcsql.la \ applyofflinelogs_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl recover_SOURCES = recover.cxx -recover_LDADD = $(top_builddir)/src/storage/libcsql.la \ +recover_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -65,7 +65,7 @@ recover_LDADD = $(top_builddir)/src/storage/libcsql.la \ recover_LDFLAGS = -lcrypt -lrt -lpthread -lodbc -ldl checkpoint_SOURCES = checkpoint.cxx -checkpoint_LDADD = $(top_builddir)/src/storage/libcsql.la \ +checkpoint_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -77,7 +77,7 @@ checkpoint_LDADD = $(top_builddir)/src/storage/libcsql.la \ checkpoint_LDFLAGS = -lcrypt -lrt -lpthread -lcrypt -lodbc -ldl catalog_SOURCES = catalog.cxx -catalog_LDADD = $(top_builddir)/src/storage/libcsql.la \ +catalog_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -88,7 +88,7 @@ catalog_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la catalog_LDFLAGS = -lcrypt -lrt -ldl -cachetable_LDADD = $(top_builddir)/src/storage/libcsql.la \ +cachetable_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -109,7 +109,7 @@ cacheverify_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/storage/libcsql.la + $(top_builddir)/src/storage/libcsqlstorage.la cacheverify_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl cacheverify_SOURCES = cacheverify.cxx @@ -122,11 +122,11 @@ csqldump_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/cache/libcacheload.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ - $(top_builddir)/src/storage/libcsql.la + $(top_builddir)/src/storage/libcsqlstorage.la csqldump_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl csqldump_SOURCES = csqldump.cxx -csqlds_LDADD = $(top_builddir)/src/storage/libcsql.la \ +csqlds_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la csqlds_LDFLAGS = -lcrypt -ldl csqlds_SOURCES = csqlds.cxx diff --git a/src/tools/Makefile.am.mmdb b/src/tools/Makefile.am.mmdb index 04985bec..a28ba882 100644 --- a/src/tools/Makefile.am.mmdb +++ b/src/tools/Makefile.am.mmdb @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/include $(all_includes) -I$(top_srcdir)/src/sql METASOURCES = AUTO bin_PROGRAMS = csql icsql catalog csqldump redo recover csql_SOURCES = isql.cxx -csql_LDADD = $(top_builddir)/src/storage/libcsql.la \ +csql_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -12,7 +12,7 @@ csql_LDFLAGS = -lrt -lpthread -lcrypt -lreadline -lcurses -ldl icsql_SOURCES = isql.cxx icsql_CPPFLAGS = -DNO_READLINE_LIB -icsql_LDADD = $(top_builddir)/src/storage/libcsql.la \ +icsql_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -22,7 +22,7 @@ icsql_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl redo_SOURCES = redo.cxx -redo_LDADD = $(top_builddir)/src/storage/libcsql.la \ +redo_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -31,7 +31,7 @@ redo_LDADD = $(top_builddir)/src/storage/libcsql.la \ redo_LDFLAGS = -lrt -lpthread -lcrypt -ldl recover_SOURCES = recover.cxx -recover_LDADD = $(top_builddir)/src/storage/libcsql.la \ +recover_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -40,7 +40,7 @@ recover_LDADD = $(top_builddir)/src/storage/libcsql.la \ recover_LDFLAGS = -lrt -lpthread -lcrypt -ldl catalog_SOURCES = catalog.cxx -catalog_LDADD = $(top_builddir)/src/storage/libcsql.la \ +catalog_LDADD = $(top_builddir)/src/storage/libcsqlstorage.la \ $(top_builddir)/src/base/libcsqlbase.la \ $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ @@ -53,6 +53,6 @@ csqldump_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ $(top_builddir)/src/network/libcsqlnw.la \ - $(top_builddir)/src/storage/libcsql.la + $(top_builddir)/src/storage/libcsqlstorage.la csqldump_LDFLAGS = -lrt -lpthread -lcrypt -ldl csqldump_SOURCES = csqldump.cxx -- 2.11.4.GIT