From 889bace33651b2ab2a40f664755469fb388eb653 Mon Sep 17 00:00:00 2001 From: prabatuty Date: Thu, 30 Apr 2009 11:58:52 +0000 Subject: [PATCH] Separating MMDB and Cache build --- buildmmdb.ksh | 18 +++++ csql.conf.mmdb | 62 ++++++++++++++++ csqlinstallmmdb.ksh | 67 +++++++++++++++++ src/Makefile.am.full | 6 ++ src/Makefile.am.mmdb | 6 ++ src/Makefile.in | 2 +- src/jdbc/Makefile.am.full | 10 +++ src/jdbc/Makefile.am.mmdb | 10 +++ src/jdbc/Makefile.in | 2 +- src/odbc/Makefile | 7 +- src/odbc/Makefile.am.full | 18 +++++ src/odbc/Makefile.am.mmdb | 15 ++++ src/odbc/Makefile.in | 5 +- src/sql/Makefile.am.full | 19 +++++ src/sql/Makefile.am.mmdb | 15 ++++ src/sql/Makefile.in | 7 +- src/tools/Makefile.am.full | 81 ++++++++++++++++++++ src/tools/Makefile.am.mmdb | 27 +++++++ src/tools/Makefile.in | 180 ++++----------------------------------------- src/tools/catalog.cxx | 5 ++ 20 files changed, 379 insertions(+), 183 deletions(-) create mode 100755 buildmmdb.ksh create mode 100644 csql.conf.mmdb create mode 100755 csqlinstallmmdb.ksh create mode 100644 src/Makefile.am.full create mode 100644 src/Makefile.am.mmdb create mode 100644 src/jdbc/Makefile.am.full create mode 100644 src/jdbc/Makefile.am.mmdb create mode 100644 src/odbc/Makefile.am.full create mode 100644 src/odbc/Makefile.am.mmdb create mode 100644 src/sql/Makefile.am.full create mode 100644 src/sql/Makefile.am.mmdb create mode 100644 src/tools/Makefile.am.full create mode 100644 src/tools/Makefile.am.mmdb diff --git a/buildmmdb.ksh b/buildmmdb.ksh new file mode 100755 index 00000000..6aa8da33 --- /dev/null +++ b/buildmmdb.ksh @@ -0,0 +1,18 @@ + +if [ "$JDK_HOME" == "" ] +then + echo "Please set JDK_HOME" + exit 1 +fi +cp src/sql/Makefile.am.mmdb src/sql/Makefile.am +cp src/tools/Makefile.am.mmdb src/tools/Makefile.am +cp src/odbc/Makefile.am.mmdb src/odbc/Makefile.am +cp src/jdbc/Makefile.am.mmdb src/jdbc/Makefile.am +cp src/Makefile.am.mmdb src/Makefile.am + +make -f Makefile.cvs + +./configure --prefix=`pwd`/install CXXFLAGS="-g -DMMDB -I$JDK_HOME/include -I$JDK_HOME/include/linux" +make +make install +./csqlinstallmmdb.ksh diff --git a/csql.conf.mmdb b/csql.conf.mmdb new file mode 100644 index 00000000..e3cea789 --- /dev/null +++ b/csql.conf.mmdb @@ -0,0 +1,62 @@ +# CSQL System Configuration File + +#####################################Server Section######################## +#Important: For Server section parameters, make sure that the value is same for the +# server process and all the csql client process which connects to it. otherwise, +# behavior is undefined + +# Page size. Each database is logically divided into pages and allocation happens +# in this unit of pages. Increasing this value will reduce frequent allocation of pages. +PAGE_SIZE= 8192 + +#Total number of client process which can connect and work with the +# database concurrently +MAX_PROCS = 100 + +# Maximum size of the system database. +MAX_SYS_DB_SIZE=1048576 + +#Maximum size of the user database file. +MAX_DB_SIZE=10485760 + +#Shared memory key to be used by the system to create and locate system database. +SYS_DB_KEY=2222 + +#Shared memory key to be used by the system to create and locate user database. +USER_DB_KEY=3333 + +#Give full path for the log file where important system actions are stored. +LOG_FILE=/tmp/log/csql/log.out + +#The virtual memory start address at which the shared memory segment +# will be created and attached. +MAP_ADDRESS=400000000 + +#Give full path for the database file where table and record information will +#be stored for durability +DATABASE_FILE=/tmp/csql/csql.db + +#Important: For Server section parameters, make sure that the value is same for the +# server process and all the csql client process which connects to it. otherwise, +# behavior is undefined +#####################################Client Section######################## + +#Mutex timeout interval seconds +MUTEX_TIMEOUT_SECS=0 +MUTEX_TIMEOUT_USECS=5000 +MUTEX_TIMEOUT_RETRIES=10 + +#Lock timeout interval seconds +LOCK_TIMEOUT_SECS=0 +LOCK_TIMEOUT_USECS=5000 +LOCK_TIMEOUT_RETRIES=10 + +##########################SqlNetworkServer Section######################## + +# Whether to enable SqlNetwork server +CSQL_SQL_SERVER=false + +#Set port for Network access +PORT=5678 + +#####################################End Section########################## diff --git a/csqlinstallmmdb.ksh b/csqlinstallmmdb.ksh new file mode 100755 index 00000000..5baa8d4f --- /dev/null +++ b/csqlinstallmmdb.ksh @@ -0,0 +1,67 @@ +#!/bin/sh +#Should run this command from the project root directory + +#TODO:validate it is project root by checking some files +root_dir=`pwd` +install_dir=`grep "prefix =" Makefile|tail -1|awk '{ print $3 }'` +echo "installdir is ${install_dir}" +#cd src/sql +#sed -e "s/getc([ ]*yyin[ ]*)/(*lexInput++)/1" dmllex.cxx >tmp.c +#cp tmp.c dmllex.cxx +#make +#cd ../.. +cd src/jdbc +./buildJdbcDriver.ksh +mkdir -p ${install_dir}/lib +cp CSqlJdbcDriver.jar ${install_dir}/lib +cd ${root_dir} +make install + +#Any new libraries needs to be added here +cd ${install_dir}/lib +mv libcsql libcsql.so +mv libcsqlsql libcsqlsql.so +mv libcsqljdbc libcsqljdbc.so +mv libcsqlnw libcsqlnw.so +mv libcsqlsqllog libcsqlsqllog.so +mv libcsqlodbc libcsqlodbc.so +ln -s libcsqlodbc.so libcsqlodbc +ln -s libcsqlsqllog.so libcsqlsqllog +ln -s libcsqlnw.so libcsqlnw +ln -s libcsqljdbc.so libcsqljdbc +ln -s libcsqlsql.so libcsqlsql +ln -s libcsql.so libcsql + + +cp ${root_dir}/src/sql/Statement.h ${install_dir}/include +cp ${root_dir}/src/sql/Parser.h ${install_dir}/include +cd ${install_dir}/include + +#rm Allocator.h CatalogTables.h Database.h +#rm DatabaseManagerImpl.h +#rm Globals.h Index.h Lock.h PredicateImpl.h +#rm Process.h SessionImpl.h TableImpl.h Transaction.h UserManagerImpl.h +cd ${install_dir}/bin +rm csqlreplserver repltable + +cp ${root_dir}/README ${install_dir}/README +cp ${root_dir}/COPYING ${install_dir} +cp ${root_dir}/AUTHORS ${install_dir} +cp ${root_dir}/ChangeLog ${install_dir} +cp ${root_dir}/csql.conf.mmdb ${install_dir}/csql.conf +cp ${root_dir}/setupenv.ksh.install ${install_dir}/setupenv.ksh +cp -R ${root_dir}/examples ${install_dir} +find ${install_dir}/examples -name "CVS" -exec rm -rf {} \; 2>/dev/null +rm -rf ${install_dir}/examples/dbapi +rm -rf ${install_dir}/lib/*.a +rm -rf ${install_dir}/lib/*.la + +cp -R ${root_dir}/docs ${install_dir} +find ${install_dir}/docs -name "CVS" -exec rm -rf {} \; 2>/dev/null + +rm -rf ${install_dir}/demo +mkdir ${install_dir}/demo +cp -R ${root_dir}/demo/wisc ${install_dir}/demo +find ${install_dir}/demo -name "CVS" -exec rm -rf {} \; 2>/dev/null +cd ${root_dir} +echo "Build completed Successfully" diff --git a/src/Makefile.am.full b/src/Makefile.am.full new file mode 100644 index 00000000..aa58228e --- /dev/null +++ b/src/Makefile.am.full @@ -0,0 +1,6 @@ + +# set the include path found by configure +INCLUDES= $(all_includes) + +# the library search path. +SUBDIRS = storage adapter gateway sqllog sqlnetwork sql cache network jdbc odbc tools diff --git a/src/Makefile.am.mmdb b/src/Makefile.am.mmdb new file mode 100644 index 00000000..85c42504 --- /dev/null +++ b/src/Makefile.am.mmdb @@ -0,0 +1,6 @@ + +# set the include path found by configure +INCLUDES= $(all_includes) + +# the library search path. +SUBDIRS = storage sqllog sqlnetwork sql network jdbc odbc tools diff --git a/src/Makefile.in b/src/Makefile.in index 892e7f2b..4bc4f57a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -171,7 +171,7 @@ top_srcdir = @top_srcdir@ INCLUDES = $(all_includes) # the library search path. -SUBDIRS = storage adapter gateway sqllog sqlnetwork sql cache network jdbc odbc tools +SUBDIRS = storage sqllog sqlnetwork sql network jdbc odbc tools all: all-recursive .SUFFIXES: diff --git a/src/jdbc/Makefile.am.full b/src/jdbc/Makefile.am.full new file mode 100644 index 00000000..3a60a727 --- /dev/null +++ b/src/jdbc/Makefile.am.full @@ -0,0 +1,10 @@ +INCLUDES = -I$(top_srcdir)/include $(all_includes) -I$(top_srcdir)/src/sql +METASOURCES = AUTO +lib_LTLIBRARIES = libcsqljdbc.la +libcsqljdbc_la_LDFLAGS = -avoid-version -module $(top_srcdir)/src/sql/.libs/libcsqlsql $(top_srcdir)/src/storage/.libs/libcsql $(top_srcdir)/src/sqllog/.libs/libcsqlsqllog $(top_srcdir)/src/network/.libs/libcsqlnw $(top_builddir)/src/cache/.libs/libcacheload $(top_srcdir)/src/sqlnetwork/.libs/libcsqlsqlnw -lcrypt +libcsqljdbc_la_SOURCES = JSqlConnection.cxx JSqlStatement.cxx + +noinst_HEADERS = JSqlConnection.h JSqlStatement.h +libcsqljdbc_a_LIBADD = +libcsqljdbc_la_DEPENDENCIES = + diff --git a/src/jdbc/Makefile.am.mmdb b/src/jdbc/Makefile.am.mmdb new file mode 100644 index 00000000..09b82e9f --- /dev/null +++ b/src/jdbc/Makefile.am.mmdb @@ -0,0 +1,10 @@ +INCLUDES = -I$(top_srcdir)/include $(all_includes) -I$(top_srcdir)/src/sql +METASOURCES = AUTO +lib_LTLIBRARIES = libcsqljdbc.la +libcsqljdbc_la_LDFLAGS = -avoid-version -module $(top_srcdir)/src/sql/.libs/libcsqlsql $(top_srcdir)/src/storage/.libs/libcsql $(top_srcdir)/src/sqllog/.libs/libcsqlsqllog $(top_srcdir)/src/network/.libs/libcsqlnw $(top_srcdir)/src/sqlnetwork/.libs/libcsqlsqlnw -lcrypt +libcsqljdbc_la_SOURCES = JSqlConnection.cxx JSqlStatement.cxx + +noinst_HEADERS = JSqlConnection.h JSqlStatement.h +libcsqljdbc_a_LIBADD = +libcsqljdbc_la_DEPENDENCIES = + diff --git a/src/jdbc/Makefile.in b/src/jdbc/Makefile.in index 9c24cf29..d6bf5f6e 100644 --- a/src/jdbc/Makefile.in +++ b/src/jdbc/Makefile.in @@ -190,7 +190,7 @@ top_srcdir = @top_srcdir@ INCLUDES = -I$(top_srcdir)/include $(all_includes) -I$(top_srcdir)/src/sql METASOURCES = AUTO lib_LTLIBRARIES = libcsqljdbc.la -libcsqljdbc_la_LDFLAGS = -avoid-version -module $(top_srcdir)/src/sql/.libs/libcsqlsql $(top_srcdir)/src/storage/.libs/libcsql $(top_srcdir)/src/sqllog/.libs/libcsqlsqllog $(top_srcdir)/src/network/.libs/libcsqlnw $(top_builddir)/src/cache/.libs/libcacheload $(top_srcdir)/src/sqlnetwork/.libs/libcsqlsqlnw -lcrypt +libcsqljdbc_la_LDFLAGS = -avoid-version -module $(top_srcdir)/src/sql/.libs/libcsqlsql $(top_srcdir)/src/storage/.libs/libcsql $(top_srcdir)/src/sqllog/.libs/libcsqlsqllog $(top_srcdir)/src/network/.libs/libcsqlnw $(top_srcdir)/src/sqlnetwork/.libs/libcsqlsqlnw -lcrypt libcsqljdbc_la_SOURCES = JSqlConnection.cxx JSqlStatement.cxx noinst_HEADERS = JSqlConnection.h JSqlStatement.h libcsqljdbc_a_LIBADD = diff --git a/src/odbc/Makefile b/src/odbc/Makefile index 04d44933..a567e3a8 100644 --- a/src/odbc/Makefile +++ b/src/odbc/Makefile @@ -92,7 +92,7 @@ CPPFLAGS = CXX = g++ CXXCPP = g++ -E CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -I/home/praba/csql/jdk1.6.0_06/include -I/home/praba/csql/jdk1.6.0_06/include/linux +CXXFLAGS = -g -DMMDB -I/home/praba/csql/jdk1.6.0_06/include -I/home/praba/csql/jdk1.6.0_06/include/linux CYGPATH_W = echo DEFS = -DHAVE_CONFIG_H DEPDIR = .deps @@ -194,11 +194,8 @@ lib_LTLIBRARIES = libcsqlodbc.la libcsqlodbc_la_LDFLAGS = -avoid-version -module \ $(top_builddir)/src/storage/.libs/libcsql \ $(top_builddir)/src/sql/.libs/libcsqlsql \ - $(top_builddir)/src/gateway/.libs/libcsqlgw \ $(top_builddir)/src/network/.libs/libcsqlnw \ - $(top_builddir)/src/sqllog/.libs/libcsqlsqllog \ - $(top_builddir)/src/cache/.libs/libcacheload \ - $(top_builddir)/src/adapter/.libs/libcsqlodbcadapter -lcrypt + $(top_builddir)/src/sqllog/.libs/libcsqlsqllog -lcrypt libcsqlodbc_la_SOURCES = odbcCommon.cxx odbcDbc.cxx odbcDesc.cxx \ odbcError.cxx odbcEnv.cxx odbcState.cxx \ diff --git a/src/odbc/Makefile.am.full b/src/odbc/Makefile.am.full new file mode 100644 index 00000000..b843c2f5 --- /dev/null +++ b/src/odbc/Makefile.am.full @@ -0,0 +1,18 @@ +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/sql -I$(top_srcdir)/include/odbc $(all_includes) +METASOURCES = AUTO +lib_LTLIBRARIES = libcsqlodbc.la +libcsqlodbc_la_LDFLAGS = -avoid-version -module \ + $(top_builddir)/src/storage/.libs/libcsql \ + $(top_builddir)/src/sql/.libs/libcsqlsql \ + $(top_builddir)/src/gateway/.libs/libcsqlgw \ + $(top_builddir)/src/network/.libs/libcsqlnw \ + $(top_builddir)/src/sqllog/.libs/libcsqlsqllog \ + $(top_builddir)/src/cache/.libs/libcacheload \ + $(top_builddir)/src/adapter/.libs/libcsqlodbcadapter -lcrypt +libcsqlodbc_la_SOURCES = odbcCommon.cxx odbcDbc.cxx odbcDesc.cxx \ +odbcError.cxx odbcEnv.cxx odbcState.cxx \ +odbcStmt.cxx + +noinst_HEADERS = odbcCommon.h odbcDbc.h odbcDesc.h \ +odbcEnv.h odbcError.h odbcStmt.h +libcsqlodbc_a_LIBADD = $(top_builddir)/src/odbc/libcsqlodbc.la diff --git a/src/odbc/Makefile.am.mmdb b/src/odbc/Makefile.am.mmdb new file mode 100644 index 00000000..7f7d845a --- /dev/null +++ b/src/odbc/Makefile.am.mmdb @@ -0,0 +1,15 @@ +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/sql -I$(top_srcdir)/include/odbc $(all_includes) +METASOURCES = AUTO +lib_LTLIBRARIES = libcsqlodbc.la +libcsqlodbc_la_LDFLAGS = -avoid-version -module \ + $(top_builddir)/src/storage/.libs/libcsql \ + $(top_builddir)/src/sql/.libs/libcsqlsql \ + $(top_builddir)/src/network/.libs/libcsqlnw \ + $(top_builddir)/src/sqllog/.libs/libcsqlsqllog -lcrypt +libcsqlodbc_la_SOURCES = odbcCommon.cxx odbcDbc.cxx odbcDesc.cxx \ +odbcError.cxx odbcEnv.cxx odbcState.cxx \ +odbcStmt.cxx + +noinst_HEADERS = odbcCommon.h odbcDbc.h odbcDesc.h \ +odbcEnv.h odbcError.h odbcStmt.h +libcsqlodbc_a_LIBADD = $(top_builddir)/src/odbc/libcsqlodbc.la diff --git a/src/odbc/Makefile.in b/src/odbc/Makefile.in index c12bfa4e..09765656 100644 --- a/src/odbc/Makefile.in +++ b/src/odbc/Makefile.in @@ -194,11 +194,8 @@ lib_LTLIBRARIES = libcsqlodbc.la libcsqlodbc_la_LDFLAGS = -avoid-version -module \ $(top_builddir)/src/storage/.libs/libcsql \ $(top_builddir)/src/sql/.libs/libcsqlsql \ - $(top_builddir)/src/gateway/.libs/libcsqlgw \ $(top_builddir)/src/network/.libs/libcsqlnw \ - $(top_builddir)/src/sqllog/.libs/libcsqlsqllog \ - $(top_builddir)/src/cache/.libs/libcacheload \ - $(top_builddir)/src/adapter/.libs/libcsqlodbcadapter -lcrypt + $(top_builddir)/src/sqllog/.libs/libcsqlsqllog -lcrypt libcsqlodbc_la_SOURCES = odbcCommon.cxx odbcDbc.cxx odbcDesc.cxx \ odbcError.cxx odbcEnv.cxx odbcState.cxx \ diff --git a/src/sql/Makefile.am.full b/src/sql/Makefile.am.full new file mode 100644 index 00000000..8a765ec1 --- /dev/null +++ b/src/sql/Makefile.am.full @@ -0,0 +1,19 @@ +INCLUDES = -I$(top_srcdir)/include $(all_includes) +YACC = yacc -vd +METASOURCES = AUTO +lib_LTLIBRARIES = libcsqlsql.la +libcsqlsql_la_LDFLAGS = -avoid-version -module \ + $(top_builddir)/src/storage/.libs/libcsql \ + $(top_builddir)/src/gateway/.libs/libcsqlgw \ + $(top_builddir)/src/sqllog/.libs/libcsqlsqllog \ + $(top_builddir)/src/adapter/.libs/libcsqlodbcadapter \ + $(top_builddir)/src/sqlnetwork/.libs/libcsqlsqlnw +libcsqlsql_la_SOURCES = dmlyacc.yxx dmllex.lxx ParsedData.cxx SelStatement.cxx \ + InsStatement.cxx UpdStatement.cxx DelStatement.cxx \ + DdlStatement.cxx \ + SqlStatement.cxx StatementFactory.cxx SqlFactory.cxx + +noinst_HEADERS = Parser.h Statement.h +libcsqlsql_a_LIBADD = $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/adapter/libcsqlgw.la diff --git a/src/sql/Makefile.am.mmdb b/src/sql/Makefile.am.mmdb new file mode 100644 index 00000000..b21e7281 --- /dev/null +++ b/src/sql/Makefile.am.mmdb @@ -0,0 +1,15 @@ +INCLUDES = -I$(top_srcdir)/include $(all_includes) +YACC = yacc -vd +METASOURCES = AUTO +lib_LTLIBRARIES = libcsqlsql.la +libcsqlsql_la_LDFLAGS = -avoid-version -module \ + $(top_builddir)/src/storage/.libs/libcsql \ + $(top_builddir)/src/sqllog/.libs/libcsqlsqllog \ + $(top_builddir)/src/sqlnetwork/.libs/libcsqlsqlnw +libcsqlsql_la_SOURCES = dmlyacc.yxx dmllex.lxx ParsedData.cxx SelStatement.cxx \ + InsStatement.cxx UpdStatement.cxx DelStatement.cxx \ + DdlStatement.cxx \ + SqlStatement.cxx StatementFactory.cxx SqlFactory.cxx + +noinst_HEADERS = Parser.h Statement.h +libcsqlsql_a_LIBADD = $(top_builddir)/src/storage/libcsql.la diff --git a/src/sql/Makefile.in b/src/sql/Makefile.in index 0824c8e8..26a356a4 100644 --- a/src/sql/Makefile.in +++ b/src/sql/Makefile.in @@ -211,9 +211,7 @@ METASOURCES = AUTO lib_LTLIBRARIES = libcsqlsql.la libcsqlsql_la_LDFLAGS = -avoid-version -module \ $(top_builddir)/src/storage/.libs/libcsql \ - $(top_builddir)/src/gateway/.libs/libcsqlgw \ $(top_builddir)/src/sqllog/.libs/libcsqlsqllog \ - $(top_builddir)/src/adapter/.libs/libcsqlodbcadapter \ $(top_builddir)/src/sqlnetwork/.libs/libcsqlsqlnw libcsqlsql_la_SOURCES = dmlyacc.yxx dmllex.lxx ParsedData.cxx SelStatement.cxx \ @@ -222,10 +220,7 @@ libcsqlsql_la_SOURCES = dmlyacc.yxx dmllex.lxx ParsedData.cxx SelStatement.cxx \ SqlStatement.cxx StatementFactory.cxx SqlFactory.cxx noinst_HEADERS = Parser.h Statement.h -libcsqlsql_a_LIBADD = $(top_builddir)/src/storage/libcsql.la \ - $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ - $(top_builddir)/src/adapter/libcsqlgw.la - +libcsqlsql_a_LIBADD = $(top_builddir)/src/storage/libcsql.la all: all-am .SUFFIXES: diff --git a/src/tools/Makefile.am.full b/src/tools/Makefile.am.full new file mode 100644 index 00000000..6552c340 --- /dev/null +++ b/src/tools/Makefile.am.full @@ -0,0 +1,81 @@ +INCLUDES = -I$(top_srcdir)/include $(all_includes) -I$(top_srcdir)/src/sql +METASOURCES = AUTO +bin_PROGRAMS = csql catalog cachetable csqlserver csqlreplserver csqlsqlserver repltable csqlcacheserver csqldump cacheverify +csql_SOURCES = isql.cxx +csql_LDADD = $(top_builddir)/src/storage/.libs/libcsql $(top_builddir)/src/sql/.libs/libcsqlsql $(top_builddir)/src/sqllog/.libs/libcsqlsqllog $(top_builddir)/src/network/.libs/libcsqlnw $(top_builddir)/src/adapter/.libs/libcsqlodbcadapter $(top_builddir)/src/gateway/.libs/libcsqlgw $(top_builddir)/src/cache/.libs/libcacheload $(top_builddir)/src/sqlnetwork/.libs/libcsqlsqlnw -lrt -lpthread -lcrypt -lodbc -lreadline + +catalog_SOURCES = catalog.cxx +catalog_LDADD = $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/cache/libcacheload.la +catalog_LDFLAGS = -lcrypt + +cachetable_LDADD = $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/storage/libcsql.la $(top_builddir)/src/adapter/libcsqlodbcadapter.la +cachetable_LDFLAGS = -lcrypt -lodbc +cachetable_SOURCES = cachetable.cxx + +cacheverify_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.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 -lrt -lpthread -lcrypt + $(top_builddir)/src/storage/libcsql.la $(top_builddir)/src/adapter/libcsqlodbcadapter.la +cacheverify_LDFLAGS = -lcrypt -lodbc +cacheverify_SOURCES = cacheverify.cxx + +repltable_LDADD = $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/gateway/libcsqlgw.la +repltable_LDFLAGS = -lcrypt -lodbc +repltable_SOURCES = repltable.cxx + +csqlserver_LDADD = $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/gateway/libcsqlgw.la -lrt -lpthread -lcrypt +csqlserver_LDFLAGS = -lcrypt -lodbc +csqlserver_SOURCES = csqlserver.cxx + +csqlreplserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/storage/libcsql.la -lrt -lpthread -lcrypt +csqlreplserver_LDFLAGS = -lcrypt -lodbc +csqlreplserver_SOURCES = csqlreplserver.cxx + +csqlsqlserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/storage/libcsql.la -lrt -lpthread -lcrypt +csqlsqlserver_LDFLAGS = -lcrypt -lodbc +csqlsqlserver_SOURCES = csqlsqlserver.cxx + +csqldump_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/storage/libcsql.la -lrt -lpthread -lcrypt +csqldump_LDFLAGS = -lcrypt -lodbc +csqldump_SOURCES = csqldump.cxx + +csqlcacheserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/storage/libcsql.la -lrt -lpthread -lcrypt +csqlcacheserver_LDFLAGS = -lcrypt -lodbc +csqlcacheserver_SOURCES = csqlcacheserver.cxx diff --git a/src/tools/Makefile.am.mmdb b/src/tools/Makefile.am.mmdb new file mode 100644 index 00000000..975f6de7 --- /dev/null +++ b/src/tools/Makefile.am.mmdb @@ -0,0 +1,27 @@ +INCLUDES = -I$(top_srcdir)/include $(all_includes) -I$(top_srcdir)/src/sql +METASOURCES = AUTO +bin_PROGRAMS = csql catalog csqlserver csqlsqlserver csqldump +csql_SOURCES = isql.cxx +csql_LDADD = $(top_builddir)/src/storage/.libs/libcsql $(top_builddir)/src/sql/.libs/libcsqlsql $(top_builddir)/src/sqllog/.libs/libcsqlsqllog $(top_builddir)/src/network/.libs/libcsqlnw $(top_builddir)/src/sqlnetwork/.libs/libcsqlsqlnw -lrt -lpthread -lcrypt -lreadline + +catalog_SOURCES = catalog.cxx +catalog_LDADD = $(top_builddir)/src/storage/libcsql.la +catalog_LDFLAGS = -lcrypt + +csqlserver_LDADD = $(top_builddir)/src/storage/libcsql.la +csqlserver_LDFLAGS = -lcrypt -lrt -lpthread +csqlserver_SOURCES = csqlserver.cxx + +csqlsqlserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/storage/libcsql.la -lrt -lpthread -lcrypt +csqlsqlserver_LDFLAGS = -lcrypt +csqlsqlserver_SOURCES = csqlsqlserver.cxx + +csqldump_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/storage/libcsql.la -lrt -lpthread -lcrypt +csqldump_LDFLAGS = -lcrypt +csqldump_SOURCES = csqldump.cxx diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in index 962b6226..d4c5459f 100644 --- a/src/tools/Makefile.in +++ b/src/tools/Makefile.in @@ -32,11 +32,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = csql$(EXEEXT) catalog$(EXEEXT) cachetable$(EXEEXT) \ - csqlserver$(EXEEXT) csqlreplserver$(EXEEXT) \ - csqlsqlserver$(EXEEXT) repltable$(EXEEXT) \ - csqlcacheserver$(EXEEXT) csqldump$(EXEEXT) \ - cacheverify$(EXEEXT) +bin_PROGRAMS = csql$(EXEEXT) catalog$(EXEEXT) csqlserver$(EXEEXT) \ + csqlsqlserver$(EXEEXT) csqldump$(EXEEXT) subdir = src/tools DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -49,30 +46,9 @@ CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_cachetable_OBJECTS = cachetable.$(OBJEXT) -cachetable_OBJECTS = $(am_cachetable_OBJECTS) -cachetable_DEPENDENCIES = $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/storage/libcsql.la \ - $(top_builddir)/src/adapter/libcsqlodbcadapter.la -cachetable_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(cachetable_LDFLAGS) $(LDFLAGS) -o $@ -am_cacheverify_OBJECTS = cacheverify.$(OBJEXT) -cacheverify_OBJECTS = $(am_cacheverify_OBJECTS) -cacheverify_DEPENDENCIES = $(top_builddir)/src/sql/libcsqlsql.la \ - $(top_builddir)/src/sqllog/libcsqlsqllog.la \ - $(top_builddir)/src/network/libcsqlnw.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 -cacheverify_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(cacheverify_LDFLAGS) $(LDFLAGS) -o $@ am_catalog_OBJECTS = catalog.$(OBJEXT) catalog_OBJECTS = $(am_catalog_OBJECTS) -catalog_DEPENDENCIES = $(top_builddir)/src/storage/libcsql.la \ - $(top_builddir)/src/cache/libcacheload.la +catalog_DEPENDENCIES = $(top_builddir)/src/storage/libcsql.la catalog_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(catalog_LDFLAGS) $(LDFLAGS) -o $@ @@ -82,52 +58,19 @@ csql_DEPENDENCIES = $(top_builddir)/src/storage/.libs/libcsql \ $(top_builddir)/src/sql/.libs/libcsqlsql \ $(top_builddir)/src/sqllog/.libs/libcsqlsqllog \ $(top_builddir)/src/network/.libs/libcsqlnw \ - $(top_builddir)/src/adapter/.libs/libcsqlodbcadapter \ - $(top_builddir)/src/gateway/.libs/libcsqlgw \ - $(top_builddir)/src/cache/.libs/libcacheload \ $(top_builddir)/src/sqlnetwork/.libs/libcsqlsqlnw -am_csqlcacheserver_OBJECTS = csqlcacheserver.$(OBJEXT) -csqlcacheserver_OBJECTS = $(am_csqlcacheserver_OBJECTS) -csqlcacheserver_DEPENDENCIES = $(top_builddir)/src/sql/libcsqlsql.la \ - $(top_builddir)/src/sqllog/libcsqlsqllog.la \ - $(top_builddir)/src/network/libcsqlnw.la \ - $(top_builddir)/src/gateway/libcsqlgw.la \ - $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ - $(top_builddir)/src/storage/libcsql.la -csqlcacheserver_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(csqlcacheserver_LDFLAGS) $(LDFLAGS) -o $@ am_csqldump_OBJECTS = csqldump.$(OBJEXT) csqldump_OBJECTS = $(am_csqldump_OBJECTS) csqldump_DEPENDENCIES = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ $(top_builddir)/src/network/libcsqlnw.la \ - $(top_builddir)/src/gateway/libcsqlgw.la \ - $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ $(top_builddir)/src/storage/libcsql.la csqldump_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(csqldump_LDFLAGS) $(LDFLAGS) -o $@ -am_csqlreplserver_OBJECTS = csqlreplserver.$(OBJEXT) -csqlreplserver_OBJECTS = $(am_csqlreplserver_OBJECTS) -csqlreplserver_DEPENDENCIES = $(top_builddir)/src/sql/libcsqlsql.la \ - $(top_builddir)/src/sqllog/libcsqlsqllog.la \ - $(top_builddir)/src/network/libcsqlnw.la \ - $(top_builddir)/src/gateway/libcsqlgw.la \ - $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ - $(top_builddir)/src/storage/libcsql.la -csqlreplserver_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(csqlreplserver_LDFLAGS) $(LDFLAGS) -o $@ am_csqlserver_OBJECTS = csqlserver.$(OBJEXT) csqlserver_OBJECTS = $(am_csqlserver_OBJECTS) -csqlserver_DEPENDENCIES = $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/storage/libcsql.la \ - $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/gateway/libcsqlgw.la +csqlserver_DEPENDENCIES = $(top_builddir)/src/storage/libcsql.la csqlserver_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(csqlserver_LDFLAGS) $(LDFLAGS) -o $@ @@ -136,23 +79,10 @@ csqlsqlserver_OBJECTS = $(am_csqlsqlserver_OBJECTS) csqlsqlserver_DEPENDENCIES = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ $(top_builddir)/src/network/libcsqlnw.la \ - $(top_builddir)/src/gateway/libcsqlgw.la \ - $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ $(top_builddir)/src/storage/libcsql.la csqlsqlserver_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(csqlsqlserver_LDFLAGS) $(LDFLAGS) -o $@ -am_repltable_OBJECTS = repltable.$(OBJEXT) -repltable_OBJECTS = $(am_repltable_OBJECTS) -repltable_DEPENDENCIES = $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/storage/libcsql.la \ - $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ - $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/gateway/libcsqlgw.la -repltable_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(repltable_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -165,16 +95,10 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(cachetable_SOURCES) $(cacheverify_SOURCES) \ - $(catalog_SOURCES) $(csql_SOURCES) $(csqlcacheserver_SOURCES) \ - $(csqldump_SOURCES) $(csqlreplserver_SOURCES) \ - $(csqlserver_SOURCES) $(csqlsqlserver_SOURCES) \ - $(repltable_SOURCES) -DIST_SOURCES = $(cachetable_SOURCES) $(cacheverify_SOURCES) \ - $(catalog_SOURCES) $(csql_SOURCES) $(csqlcacheserver_SOURCES) \ - $(csqldump_SOURCES) $(csqlreplserver_SOURCES) \ - $(csqlserver_SOURCES) $(csqlsqlserver_SOURCES) \ - $(repltable_SOURCES) +SOURCES = $(catalog_SOURCES) $(csql_SOURCES) $(csqldump_SOURCES) \ + $(csqlserver_SOURCES) $(csqlsqlserver_SOURCES) +DIST_SOURCES = $(catalog_SOURCES) $(csql_SOURCES) $(csqldump_SOURCES) \ + $(csqlserver_SOURCES) $(csqlsqlserver_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -292,82 +216,27 @@ top_srcdir = @top_srcdir@ INCLUDES = -I$(top_srcdir)/include $(all_includes) -I$(top_srcdir)/src/sql METASOURCES = AUTO csql_SOURCES = isql.cxx -csql_LDADD = $(top_builddir)/src/storage/.libs/libcsql $(top_builddir)/src/sql/.libs/libcsqlsql $(top_builddir)/src/sqllog/.libs/libcsqlsqllog $(top_builddir)/src/network/.libs/libcsqlnw $(top_builddir)/src/adapter/.libs/libcsqlodbcadapter $(top_builddir)/src/gateway/.libs/libcsqlgw $(top_builddir)/src/cache/.libs/libcacheload $(top_builddir)/src/sqlnetwork/.libs/libcsqlsqlnw -lrt -lpthread -lcrypt -lodbc -lreadline +csql_LDADD = $(top_builddir)/src/storage/.libs/libcsql $(top_builddir)/src/sql/.libs/libcsqlsql $(top_builddir)/src/sqllog/.libs/libcsqlsqllog $(top_builddir)/src/network/.libs/libcsqlnw $(top_builddir)/src/sqlnetwork/.libs/libcsqlsqlnw -lrt -lpthread -lcrypt -lreadline catalog_SOURCES = catalog.cxx -catalog_LDADD = $(top_builddir)/src/storage/libcsql.la \ - $(top_builddir)/src/cache/libcacheload.la - +catalog_LDADD = $(top_builddir)/src/storage/libcsql.la catalog_LDFLAGS = -lcrypt -cachetable_LDADD = $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/storage/libcsql.la $(top_builddir)/src/adapter/libcsqlodbcadapter.la - -cachetable_LDFLAGS = -lcrypt -lodbc -cachetable_SOURCES = cachetable.cxx -cacheverify_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ - $(top_builddir)/src/sqllog/libcsqlsqllog.la \ - $(top_builddir)/src/network/libcsqlnw.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 -lrt -lpthread -lcrypt - -cacheverify_LDFLAGS = -lcrypt -lodbc -cacheverify_SOURCES = cacheverify.cxx -repltable_LDADD = $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/storage/libcsql.la \ - $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ - $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/gateway/libcsqlgw.la - -repltable_LDFLAGS = -lcrypt -lodbc -repltable_SOURCES = repltable.cxx -csqlserver_LDADD = $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/storage/libcsql.la \ - $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/gateway/libcsqlgw.la -lrt -lpthread -lcrypt - -csqlserver_LDFLAGS = -lcrypt -lodbc +csqlserver_LDADD = $(top_builddir)/src/storage/libcsql.la +csqlserver_LDFLAGS = -lcrypt -lrt -lpthread csqlserver_SOURCES = csqlserver.cxx -csqlreplserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ - $(top_builddir)/src/sqllog/libcsqlsqllog.la \ - $(top_builddir)/src/network/libcsqlnw.la \ - $(top_builddir)/src/gateway/libcsqlgw.la \ - $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ - $(top_builddir)/src/storage/libcsql.la -lrt -lpthread -lcrypt - -csqlreplserver_LDFLAGS = -lcrypt -lodbc -csqlreplserver_SOURCES = csqlreplserver.cxx csqlsqlserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ $(top_builddir)/src/network/libcsqlnw.la \ - $(top_builddir)/src/gateway/libcsqlgw.la \ - $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ $(top_builddir)/src/storage/libcsql.la -lrt -lpthread -lcrypt -csqlsqlserver_LDFLAGS = -lcrypt -lodbc +csqlsqlserver_LDFLAGS = -lcrypt csqlsqlserver_SOURCES = csqlsqlserver.cxx csqldump_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/sqllog/libcsqlsqllog.la \ $(top_builddir)/src/network/libcsqlnw.la \ - $(top_builddir)/src/gateway/libcsqlgw.la \ - $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ $(top_builddir)/src/storage/libcsql.la -lrt -lpthread -lcrypt -csqldump_LDFLAGS = -lcrypt -lodbc +csqldump_LDFLAGS = -lcrypt csqldump_SOURCES = csqldump.cxx -csqlcacheserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ - $(top_builddir)/src/sqllog/libcsqlsqllog.la \ - $(top_builddir)/src/network/libcsqlnw.la \ - $(top_builddir)/src/gateway/libcsqlgw.la \ - $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ - $(top_builddir)/src/storage/libcsql.la -lrt -lpthread -lcrypt - -csqlcacheserver_LDFLAGS = -lcrypt -lodbc -csqlcacheserver_SOURCES = csqlcacheserver.cxx all: all-am .SUFFIXES: @@ -429,36 +298,21 @@ clean-binPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done -cachetable$(EXEEXT): $(cachetable_OBJECTS) $(cachetable_DEPENDENCIES) - @rm -f cachetable$(EXEEXT) - $(cachetable_LINK) $(cachetable_OBJECTS) $(cachetable_LDADD) $(LIBS) -cacheverify$(EXEEXT): $(cacheverify_OBJECTS) $(cacheverify_DEPENDENCIES) - @rm -f cacheverify$(EXEEXT) - $(cacheverify_LINK) $(cacheverify_OBJECTS) $(cacheverify_LDADD) $(LIBS) catalog$(EXEEXT): $(catalog_OBJECTS) $(catalog_DEPENDENCIES) @rm -f catalog$(EXEEXT) $(catalog_LINK) $(catalog_OBJECTS) $(catalog_LDADD) $(LIBS) csql$(EXEEXT): $(csql_OBJECTS) $(csql_DEPENDENCIES) @rm -f csql$(EXEEXT) $(CXXLINK) $(csql_OBJECTS) $(csql_LDADD) $(LIBS) -csqlcacheserver$(EXEEXT): $(csqlcacheserver_OBJECTS) $(csqlcacheserver_DEPENDENCIES) - @rm -f csqlcacheserver$(EXEEXT) - $(csqlcacheserver_LINK) $(csqlcacheserver_OBJECTS) $(csqlcacheserver_LDADD) $(LIBS) csqldump$(EXEEXT): $(csqldump_OBJECTS) $(csqldump_DEPENDENCIES) @rm -f csqldump$(EXEEXT) $(csqldump_LINK) $(csqldump_OBJECTS) $(csqldump_LDADD) $(LIBS) -csqlreplserver$(EXEEXT): $(csqlreplserver_OBJECTS) $(csqlreplserver_DEPENDENCIES) - @rm -f csqlreplserver$(EXEEXT) - $(csqlreplserver_LINK) $(csqlreplserver_OBJECTS) $(csqlreplserver_LDADD) $(LIBS) csqlserver$(EXEEXT): $(csqlserver_OBJECTS) $(csqlserver_DEPENDENCIES) @rm -f csqlserver$(EXEEXT) $(csqlserver_LINK) $(csqlserver_OBJECTS) $(csqlserver_LDADD) $(LIBS) csqlsqlserver$(EXEEXT): $(csqlsqlserver_OBJECTS) $(csqlsqlserver_DEPENDENCIES) @rm -f csqlsqlserver$(EXEEXT) $(csqlsqlserver_LINK) $(csqlsqlserver_OBJECTS) $(csqlsqlserver_LDADD) $(LIBS) -repltable$(EXEEXT): $(repltable_OBJECTS) $(repltable_DEPENDENCIES) - @rm -f repltable$(EXEEXT) - $(repltable_LINK) $(repltable_OBJECTS) $(repltable_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -466,16 +320,11 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cachetable.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cacheverify.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/catalog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csqlcacheserver.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csqldump.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csqlreplserver.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csqlserver.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csqlsqlserver.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isql.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/repltable.Po@am__quote@ .cxx.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -683,7 +532,6 @@ uninstall-am: uninstall-binPROGRAMS pdf pdf-am ps ps-am tags uninstall uninstall-am \ uninstall-binPROGRAMS - $(top_builddir)/src/storage/libcsql.la $(top_builddir)/src/adapter/libcsqlodbcadapter.la # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/src/tools/catalog.cxx b/src/tools/catalog.cxx index d916abde..a679915a 100644 --- a/src/tools/catalog.cxx +++ b/src/tools/catalog.cxx @@ -142,11 +142,16 @@ int main(int argc, char **argv) while (iter.hasElement()) { elem = (Identifier*) iter.nextElement(); +#ifndef MMDB rv=CacheTableLoader::isTableCached(elem->name); if(rv!=OK){ printf(" %s \n", elem->name); dbMgr->dropTable(elem->name); } +#else + printf(" %s \n", elem->name); + dbMgr->dropTable(elem->name); +#endif count++; } if (count ==0) printf(" \n"); -- 2.11.4.GIT