/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 06:28:53 UTC
  • Revision ID: edam@waxworlds.org-20100729062853-4i2fec52m86mh724
- made basic_statement::step() protected, for use by query and command only
- moved basic_statement::operator<<() to command and query instead; one needs to accept sqlite::exec, the other doesn't
- added tests for query::operator<<()
- added code to invlaidate in-progress queries during any transaction rollbacks (currently segfaults in basic_statement::finalize())
- added new sqlite_error constructor that obtains a full error message
- implemented database::database_mutex_guard class
- swapped command's step mutex in favour of the database mutex

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.in
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 =
 
75
libsqlite3cc_la_DEPENDENCIES =
76
76
am_libsqlite3cc_la_OBJECTS = database.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@
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)