From 39144e33dd7503842800fabecb74bff856354f5a Mon Sep 17 00:00:00 2001 From: prabatuty Date: Sat, 7 May 2011 18:44:53 +0000 Subject: [PATCH] icsql with no dependency on readline library --- src/tools/Makefile.am.full | 13 ++ src/tools/Makefile.am.mmdb | 12 ++ src/tools/Makefile.in | 431 ++++++++++++++++++++++++++++++++------------- src/tools/isql.cxx | 10 +- 4 files changed, 339 insertions(+), 127 deletions(-) diff --git a/src/tools/Makefile.am.full b/src/tools/Makefile.am.full index 1e0e22bc..828858e4 100644 --- a/src/tools/Makefile.am.full +++ b/src/tools/Makefile.am.full @@ -13,6 +13,19 @@ csql_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la 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 \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la +icsql_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl + + redo_SOURCES = redo.cxx redo_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/sql/libcsqlsql.la \ diff --git a/src/tools/Makefile.am.mmdb b/src/tools/Makefile.am.mmdb index 10336980..4ab8e46d 100644 --- a/src/tools/Makefile.am.mmdb +++ b/src/tools/Makefile.am.mmdb @@ -8,6 +8,18 @@ csql_LDADD = $(top_builddir)/src/storage/libcsql.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la csql_LDFLAGS = -lrt -lpthread -lcrypt -lreadline -lcurses -ldl +csql_SOURCES = isql.cxx +icsql_CPPFLAGS = -DNO_READLINE_LIB +icsql_LDADD = $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la +icsql_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl + redo_SOURCES = redo.cxx redo_LDADD = $(top_builddir)/src/storage/libcsql.la \ diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in index c6de4179..eaa17902 100644 --- a/src/tools/Makefile.in +++ b/src/tools/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -33,10 +33,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = csql$(EXEEXT) catalog$(EXEEXT) cachetable$(EXEEXT) \ - csqlserver$(EXEEXT) csqlreplserver$(EXEEXT) \ - csqlsqlserver$(EXEEXT) repltable$(EXEEXT) \ + csqlserver$(EXEEXT) csqlsqlserver$(EXEEXT) \ csqlcacheserver$(EXEEXT) csqldump$(EXEEXT) \ - cacheverify$(EXEEXT) redo$(EXEEXT) + cacheverify$(EXEEXT) redo$(EXEEXT) recover$(EXEEXT) \ + checkpoint$(EXEEXT) csqlds$(EXEEXT) csqlasyncserver$(EXEEXT) \ + csqlcheckpointserver$(EXEEXT) applyofflinelogs$(EXEEXT) subdir = src/tools DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -49,11 +50,30 @@ CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) +am_applyofflinelogs_OBJECTS = applyofflinelogs.$(OBJEXT) +applyofflinelogs_OBJECTS = $(am_applyofflinelogs_OBJECTS) +applyofflinelogs_DEPENDENCIES = \ + $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la +applyofflinelogs_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(applyofflinelogs_LDFLAGS) $(LDFLAGS) -o $@ 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_DEPENDENCIES = $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la cachetable_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(cachetable_LDFLAGS) $(LDFLAGS) -o $@ @@ -62,6 +82,8 @@ 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/sqlnetwork/libcsqlsqlnw.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 \ @@ -72,62 +94,113 @@ cacheverify_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ am_catalog_OBJECTS = catalog.$(OBJEXT) catalog_OBJECTS = $(am_catalog_OBJECTS) catalog_DEPENDENCIES = $(top_builddir)/src/storage/libcsql.la \ - $(top_builddir)/src/cache/libcacheload.la + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la catalog_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(catalog_LDFLAGS) $(LDFLAGS) -o $@ +am_checkpoint_OBJECTS = checkpoint.$(OBJEXT) +checkpoint_OBJECTS = $(am_checkpoint_OBJECTS) +checkpoint_DEPENDENCIES = $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la +checkpoint_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(checkpoint_LDFLAGS) $(LDFLAGS) -o $@ am_csql_OBJECTS = isql.$(OBJEXT) csql_OBJECTS = $(am_csql_OBJECTS) -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 \ +csql_DEPENDENCIES = $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la +csql_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(csql_LDFLAGS) $(LDFLAGS) -o $@ +am_csqlasyncserver_OBJECTS = csqlasyncserver.$(OBJEXT) +csqlasyncserver_OBJECTS = $(am_csqlasyncserver_OBJECTS) +csqlasyncserver_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/sqlnetwork/libcsqlsqlnw.la \ + $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ $(top_builddir)/src/storage/libcsql.la +csqlasyncserver_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(csqlasyncserver_LDFLAGS) $(LDFLAGS) -o $@ +am_csqlcacheserver_OBJECTS = csqlcacheserver.$(OBJEXT) +csqlcacheserver_OBJECTS = $(am_csqlcacheserver_OBJECTS) +csqlcacheserver_DEPENDENCIES = $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la csqlcacheserver_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(csqlcacheserver_LDFLAGS) $(LDFLAGS) -o $@ +am_csqlcheckpointserver_OBJECTS = csqlcheckpointserver.$(OBJEXT) +csqlcheckpointserver_OBJECTS = $(am_csqlcheckpointserver_OBJECTS) +csqlcheckpointserver_DEPENDENCIES = \ + $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la +csqlcheckpointserver_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(csqlcheckpointserver_LDFLAGS) $(LDFLAGS) -o $@ +am_csqlds_OBJECTS = csqlds.$(OBJEXT) +csqlds_OBJECTS = $(am_csqlds_OBJECTS) +csqlds_DEPENDENCIES = $(top_builddir)/src/storage/libcsql.la +csqlds_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(csqlds_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/sqlnetwork/libcsqlsqlnw.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 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 \ +am_csqlserver_OBJECTS = csqlserver.$(OBJEXT) +csqlserver_OBJECTS = $(am_csqlserver_OBJECTS) +csqlserver_DEPENDENCIES = $(top_builddir)/src/storage/libcsql.la \ + $(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/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/gateway/libcsqlgw.la + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la csqlserver_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(csqlserver_LDFLAGS) $(LDFLAGS) -o $@ @@ -138,32 +211,40 @@ csqlsqlserver_DEPENDENCIES = $(top_builddir)/src/sql/libcsqlsql.la \ $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/gateway/libcsqlgw.la \ $(top_builddir)/src/cache/libcacheload.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 csqlsqlserver_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(csqlsqlserver_LDFLAGS) $(LDFLAGS) -o $@ +am_recover_OBJECTS = recover.$(OBJEXT) +recover_OBJECTS = $(am_recover_OBJECTS) +recover_DEPENDENCIES = $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la +recover_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(recover_LDFLAGS) $(LDFLAGS) -o $@ am_redo_OBJECTS = redo.$(OBJEXT) redo_OBJECTS = $(am_redo_OBJECTS) -redo_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_repltable_OBJECTS = repltable.$(OBJEXT) -repltable_OBJECTS = $(am_repltable_OBJECTS) -repltable_DEPENDENCIES = $(top_builddir)/src/cache/libcacheload.la \ - $(top_builddir)/src/storage/libcsql.la \ +redo_DEPENDENCIES = $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.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@ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la +redo_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(redo_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -175,16 +256,20 @@ 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) $(redo_SOURCES) \ - $(repltable_SOURCES) -DIST_SOURCES = $(cachetable_SOURCES) $(cacheverify_SOURCES) \ - $(catalog_SOURCES) $(csql_SOURCES) $(csqlcacheserver_SOURCES) \ - $(csqldump_SOURCES) $(csqlreplserver_SOURCES) \ - $(csqlserver_SOURCES) $(csqlsqlserver_SOURCES) $(redo_SOURCES) \ - $(repltable_SOURCES) +SOURCES = $(applyofflinelogs_SOURCES) $(cachetable_SOURCES) \ + $(cacheverify_SOURCES) $(catalog_SOURCES) \ + $(checkpoint_SOURCES) $(csql_SOURCES) \ + $(csqlasyncserver_SOURCES) $(csqlcacheserver_SOURCES) \ + $(csqlcheckpointserver_SOURCES) $(csqlds_SOURCES) \ + $(csqldump_SOURCES) $(csqlserver_SOURCES) \ + $(csqlsqlserver_SOURCES) $(recover_SOURCES) $(redo_SOURCES) +DIST_SOURCES = $(applyofflinelogs_SOURCES) $(cachetable_SOURCES) \ + $(cacheverify_SOURCES) $(catalog_SOURCES) \ + $(checkpoint_SOURCES) $(csql_SOURCES) \ + $(csqlasyncserver_SOURCES) $(csqlcacheserver_SOURCES) \ + $(csqlcheckpointserver_SOURCES) $(csqlds_SOURCES) \ + $(csqldump_SOURCES) $(csqlserver_SOURCES) \ + $(csqlsqlserver_SOURCES) $(recover_SOURCES) $(redo_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -207,6 +292,7 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -232,6 +318,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -302,84 +389,166 @@ 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/libcsql.la \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la + +csql_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -lreadline -lcurses -ldl redo_SOURCES = redo.cxx -redo_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 +redo_LDADD = $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la + +redo_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -lreadline -lcurses -ldl +applyofflinelogs_SOURCES = applyofflinelogs.cxx +applyofflinelogs_LDADD = $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la + +applyofflinelogs_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl +recover_SOURCES = recover.cxx +recover_LDADD = $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la + +recover_LDFLAGS = -lcrypt -lrt -lpthread -lodbc -ldl +checkpoint_SOURCES = checkpoint.cxx +checkpoint_LDADD = $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la + +checkpoint_LDFLAGS = -lcrypt -lrt -lpthread -lcrypt -lodbc -ldl 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 +catalog_LDADD = $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la + +catalog_LDFLAGS = -lcrypt -lrt -ldl +cachetable_LDADD = $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la + +cachetable_LDFLAGS = -lcrypt -lodbc -lrt -ldl 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/sqlnetwork/libcsqlsqlnw.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 -cacheverify_LDFLAGS = -lcrypt -lodbc +cacheverify_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl 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 \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la + +csqlserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl csqlserver_SOURCES = csqlserver.cxx -csqlreplserver_LDADD = $(top_builddir)/src/sql/libcsqlsql.la \ +csqlasyncserver_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/sqlnetwork/libcsqlsqlnw.la \ + $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ - $(top_builddir)/src/storage/libcsql.la -lrt -lpthread -lcrypt + $(top_builddir)/src/storage/libcsql.la -csqlreplserver_LDFLAGS = -lcrypt -lodbc -csqlreplserver_SOURCES = csqlreplserver.cxx +csqlasyncserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl +csqlasyncserver_SOURCES = csqlasyncserver.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/sqlnetwork/libcsqlsqlnw.la \ + $(top_builddir)/src/network/libcsqlnw.la \ $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ - $(top_builddir)/src/storage/libcsql.la -lrt -lpthread -lcrypt + $(top_builddir)/src/storage/libcsql.la -csqlsqlserver_LDFLAGS = -lcrypt -lodbc +csqlsqlserver_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl 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/sqlnetwork/libcsqlsqlnw.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 + $(top_builddir)/src/storage/libcsql.la -csqlcacheserver_LDFLAGS = -lcrypt -lodbc +csqldump_LDFLAGS = -lrt -lpthread -lcrypt -lodbc -ldl +csqldump_SOURCES = csqldump.cxx +csqlcacheserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la + +csqlcacheserver_LDFLAGS = -lcrypt -lodbc -lrt -lpthread -ldl csqlcacheserver_SOURCES = csqlcacheserver.cxx +csqlcheckpointserver_LDADD = $(top_builddir)/src/storage/libcsql.la \ + $(top_builddir)/src/sql/libcsqlsql.la \ + $(top_builddir)/src/sqllog/libcsqlsqllog.la \ + $(top_builddir)/src/network/libcsqlnw.la \ + $(top_builddir)/src/adapter/libcsqlodbcadapter.la \ + $(top_builddir)/src/gateway/libcsqlgw.la \ + $(top_builddir)/src/cache/libcacheload.la \ + $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la + +csqlcheckpointserver_LDFLAGS = -lcrypt -lodbc -lrt -lpthread -ldl +csqlcheckpointserver_SOURCES = csqlcheckpointserver.cxx +csqlds_LDADD = $(top_builddir)/src/storage/libcsql.la +csqlds_LDFLAGS = -lcrypt -ldl +csqlds_SOURCES = csqlds.cxx all: all-am .SUFFIXES: @@ -422,8 +591,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -441,6 +610,9 @@ clean-binPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done +applyofflinelogs$(EXEEXT): $(applyofflinelogs_OBJECTS) $(applyofflinelogs_DEPENDENCIES) + @rm -f applyofflinelogs$(EXEEXT) + $(applyofflinelogs_LINK) $(applyofflinelogs_OBJECTS) $(applyofflinelogs_LDADD) $(LIBS) cachetable$(EXEEXT): $(cachetable_OBJECTS) $(cachetable_DEPENDENCIES) @rm -f cachetable$(EXEEXT) $(cachetable_LINK) $(cachetable_OBJECTS) $(cachetable_LDADD) $(LIBS) @@ -450,30 +622,39 @@ cacheverify$(EXEEXT): $(cacheverify_OBJECTS) $(cacheverify_DEPENDENCIES) catalog$(EXEEXT): $(catalog_OBJECTS) $(catalog_DEPENDENCIES) @rm -f catalog$(EXEEXT) $(catalog_LINK) $(catalog_OBJECTS) $(catalog_LDADD) $(LIBS) +checkpoint$(EXEEXT): $(checkpoint_OBJECTS) $(checkpoint_DEPENDENCIES) + @rm -f checkpoint$(EXEEXT) + $(checkpoint_LINK) $(checkpoint_OBJECTS) $(checkpoint_LDADD) $(LIBS) csql$(EXEEXT): $(csql_OBJECTS) $(csql_DEPENDENCIES) @rm -f csql$(EXEEXT) - $(CXXLINK) $(csql_OBJECTS) $(csql_LDADD) $(LIBS) + $(csql_LINK) $(csql_OBJECTS) $(csql_LDADD) $(LIBS) +csqlasyncserver$(EXEEXT): $(csqlasyncserver_OBJECTS) $(csqlasyncserver_DEPENDENCIES) + @rm -f csqlasyncserver$(EXEEXT) + $(csqlasyncserver_LINK) $(csqlasyncserver_OBJECTS) $(csqlasyncserver_LDADD) $(LIBS) csqlcacheserver$(EXEEXT): $(csqlcacheserver_OBJECTS) $(csqlcacheserver_DEPENDENCIES) @rm -f csqlcacheserver$(EXEEXT) $(csqlcacheserver_LINK) $(csqlcacheserver_OBJECTS) $(csqlcacheserver_LDADD) $(LIBS) +csqlcheckpointserver$(EXEEXT): $(csqlcheckpointserver_OBJECTS) $(csqlcheckpointserver_DEPENDENCIES) + @rm -f csqlcheckpointserver$(EXEEXT) + $(csqlcheckpointserver_LINK) $(csqlcheckpointserver_OBJECTS) $(csqlcheckpointserver_LDADD) $(LIBS) +csqlds$(EXEEXT): $(csqlds_OBJECTS) $(csqlds_DEPENDENCIES) + @rm -f csqlds$(EXEEXT) + $(csqlds_LINK) $(csqlds_OBJECTS) $(csqlds_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) +recover$(EXEEXT): $(recover_OBJECTS) $(recover_DEPENDENCIES) + @rm -f recover$(EXEEXT) + $(recover_LINK) $(recover_OBJECTS) $(recover_LDADD) $(LIBS) redo$(EXEEXT): $(redo_OBJECTS) $(redo_DEPENDENCIES) @rm -f redo$(EXEEXT) - $(CXXLINK) $(redo_OBJECTS) $(redo_LDADD) $(LIBS) -repltable$(EXEEXT): $(repltable_OBJECTS) $(repltable_DEPENDENCIES) - @rm -f repltable$(EXEEXT) - $(repltable_LINK) $(repltable_OBJECTS) $(repltable_LDADD) $(LIBS) + $(redo_LINK) $(redo_OBJECTS) $(redo_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -481,17 +662,21 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/applyofflinelogs.Po@am__quote@ @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)/checkpoint.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csqlasyncserver.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csqlcacheserver.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csqlcheckpointserver.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csqlds.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)/recover.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/redo.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 $@ $< @@ -525,8 +710,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -538,8 +723,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -549,13 +734,12 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -699,7 +883,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/isql.cxx b/src/tools/isql.cxx index 1154fa37..4c11cc8f 100644 --- a/src/tools/isql.cxx +++ b/src/tools/isql.cxx @@ -21,8 +21,10 @@ #include #include #include +#ifndef NO_READLINE_LIB #include #include +#endif #include #define SQL_STMT_LEN 8192 void printVariables(); @@ -434,7 +436,8 @@ char getQueryFromStdIn(char *buf) { char c, *bufBegin=buf; int ln, charCnt=0; - /*ln=1; +#ifdef NO_READLINE_LIB + ln=1; printf("CSQL>"); while( (c=(char ) getchar()) != EOF && c != ';') { @@ -448,16 +451,17 @@ char getQueryFromStdIn(char *buf) *bufBegin ='\0'; return 0; } - printf("=%d=\n", c); + //printf("=%d=\n", c); } *buf++ = ';'; *buf = '\0'; - */ +#else strcpy(buf, ""); char *line = readline("CSQL>"); if (line) {strcpy(buf, line); add_history(line); } else { free(line); return EOF; } free(line); +#endif return 0; } char getQueryFromFile(char *buf) -- 2.11.4.GIT