/sqlite3cc

To get this branch, use:
bzr branch http://bzr.ed.am/sqlite3cc

« back to all changes in this revision

Viewing changes to src/Makefile.in

  • Committer: edam
  • Date: 2010-07-29 20:56:19 UTC
  • Revision ID: edam@waxworlds.org-20100729205619-a9yo4uzu647nvnsj
- renamed database to connection to better identify what it is (would database_connection be better though?)
- moved basic_statement and basic_transaction to sqlite::detail
- made sqlite::threadsafe() return the threading mode int, not a bool
- renamed row::index() to row_number() so it isn't confused with column index
- added typedef for deferred_transaction
- added early rollback method to transaction_guard
- allowed transaction_guard::~transaction_guard() to throw exceptions, since when it needs to, we're really screwed anyway
- bugfix: query::reset() didn't reset the internal row counter
- added query::num_results()
- added docs/design-notes
- reimplemented query::iterator so that increment() (which performs a step() on the query) now caches the returned row to be returned during dereference() (previously it stashed details and returned new row!?)
- bugfix: resetting active queries during rollbacks would hang!

Show diffs side-by-side

added added

removed removed

1
 
# Makefile.in generated by automake 1.11 from Makefile.am.
 
1
# Makefile.in generated by automake 1.11.1 from Makefile.am.
2
2
# @configure_input@
3
3
 
4
4
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
72
72
  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
73
73
am__installdirs = "$(DESTDIR)$(libdir)"
74
74
LTLIBRARIES = $(lib_LTLIBRARIES)
75
 
libsqlite3cc_la_LIBADD =
76
 
am_libsqlite3cc_la_OBJECTS = database.lo exception.lo \
 
75
libsqlite3cc_la_DEPENDENCIES =
 
76
am_libsqlite3cc_la_OBJECTS = connection.lo exception.lo \
77
77
        basic_statement.lo command.lo query.lo row.lo transaction.lo \
78
78
        manipulator.lo util.lo
79
79
libsqlite3cc_la_OBJECTS = $(am_libsqlite3cc_la_OBJECTS)
 
80
libsqlite3cc_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 
81
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 
82
        $(CXXFLAGS) $(libsqlite3cc_la_LDFLAGS) $(LDFLAGS) -o $@
80
83
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
81
84
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
82
85
am__depfiles_maybe = depfiles
132
135
LDFLAGS = @LDFLAGS@
133
136
LIBOBJS = @LIBOBJS@
134
137
LIBS = @LIBS@
 
138
LIBSQLITE3CC_INTERFACE = @LIBSQLITE3CC_INTERFACE@
135
139
LIBTOOL = @LIBTOOL@
136
140
LIPO = @LIPO@
137
141
LN_S = @LN_S@
214
218
AM_CPPFLAGS = -I$(top_srcdir)/include
215
219
lib_LTLIBRARIES = libsqlite3cc.la
216
220
libsqlite3cc_la_SOURCES = \
217
 
        database.cc \
 
221
        connection.cc \
218
222
        exception.cc \
219
223
        basic_statement.cc \
220
224
        command.cc \
224
228
        manipulator.cc \
225
229
        util.cc
226
230
 
 
231
libsqlite3cc_la_LIBADD = \
 
232
        -lboost_thread-mt \
 
233
        -lsqlite3
 
234
 
 
235
libsqlite3cc_la_LDFLAGS = -version-info @LIBSQLITE3CC_INTERFACE@
227
236
all: all-am
228
237
 
229
238
.SUFFIXES:
290
299
          rm -f "$${dir}/so_locations"; \
291
300
        done
292
301
libsqlite3cc.la: $(libsqlite3cc_la_OBJECTS) $(libsqlite3cc_la_DEPENDENCIES) 
293
 
        $(CXXLINK) -rpath $(libdir) $(libsqlite3cc_la_OBJECTS) $(libsqlite3cc_la_LIBADD) $(LIBS)
 
302
        $(libsqlite3cc_la_LINK) -rpath $(libdir) $(libsqlite3cc_la_OBJECTS) $(libsqlite3cc_la_LIBADD) $(LIBS)
294
303
 
295
304
mostlyclean-compile:
296
305
        -rm -f *.$(OBJEXT)
300
309
 
301
310
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic_statement.Plo@am__quote@
302
311
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command.Plo@am__quote@
303
 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/database.Plo@am__quote@
 
312
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connection.Plo@am__quote@
304
313
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exception.Plo@am__quote@
305
314
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/manipulator.Plo@am__quote@
306
315
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/query.Plo@am__quote@