/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
1
 
# Makefile.in generated by automake 1.11.3 from Makefile.am.
 
1
# Makefile.in generated by automake 1.11 from Makefile.am.
2
2
# @configure_input@
3
3
 
4
4
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
 
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
 
# Foundation, Inc.
 
5
# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 
6
# Inc.
7
7
# This Makefile.in is free software; the Free Software Foundation
8
8
# gives unlimited permission to copy and/or distribute it,
9
9
# with or without modifications, as long as this notice is preserved.
70
70
am__base_list = \
71
71
  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
72
72
  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
73
 
am__uninstall_files_from_dir = { \
74
 
  test -z "$$files" \
75
 
    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
76
 
    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
77
 
         $(am__cd) "$$dir" && rm -f $$files; }; \
78
 
  }
79
73
am__installdirs = "$(DESTDIR)$(libdir)"
80
74
LTLIBRARIES = $(lib_LTLIBRARIES)
81
75
libsqlite3cc_la_DEPENDENCIES =
82
 
am_libsqlite3cc_la_OBJECTS = connection.lo exception.lo \
 
76
am_libsqlite3cc_la_OBJECTS = database.lo exception.lo \
83
77
        basic_statement.lo command.lo query.lo row.lo transaction.lo \
84
78
        manipulator.lo util.lo
85
79
libsqlite3cc_la_OBJECTS = $(am_libsqlite3cc_la_OBJECTS)
123
117
CYGPATH_W = @CYGPATH_W@
124
118
DEFS = @DEFS@
125
119
DEPDIR = @DEPDIR@
126
 
DLLTOOL = @DLLTOOL@
127
120
DSYMUTIL = @DSYMUTIL@
128
121
DUMPBIN = @DUMPBIN@
129
122
ECHO_C = @ECHO_C@
148
141
LN_S = @LN_S@
149
142
LTLIBOBJS = @LTLIBOBJS@
150
143
MAKEINFO = @MAKEINFO@
151
 
MANIFEST_TOOL = @MANIFEST_TOOL@
152
144
MKDIR_P = @MKDIR_P@
153
145
NM = @NM@
154
146
NMEDIT = @NMEDIT@
174
166
abs_srcdir = @abs_srcdir@
175
167
abs_top_builddir = @abs_top_builddir@
176
168
abs_top_srcdir = @abs_top_srcdir@
177
 
ac_ct_AR = @ac_ct_AR@
178
169
ac_ct_CC = @ac_ct_CC@
179
170
ac_ct_CXX = @ac_ct_CXX@
180
171
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
208
199
libexecdir = @libexecdir@
209
200
localedir = @localedir@
210
201
localstatedir = @localstatedir@
 
202
lt_ECHO = @lt_ECHO@
211
203
mandir = @mandir@
212
204
mkdir_p = @mkdir_p@
213
205
oldincludedir = @oldincludedir@
226
218
AM_CPPFLAGS = -I$(top_srcdir)/include
227
219
lib_LTLIBRARIES = libsqlite3cc.la
228
220
libsqlite3cc_la_SOURCES = \
229
 
        connection.cc \
 
221
        database.cc \
230
222
        exception.cc \
231
223
        basic_statement.cc \
232
224
        command.cc \
306
298
          echo "rm -f \"$${dir}/so_locations\""; \
307
299
          rm -f "$${dir}/so_locations"; \
308
300
        done
309
 
libsqlite3cc.la: $(libsqlite3cc_la_OBJECTS) $(libsqlite3cc_la_DEPENDENCIES) $(EXTRA_libsqlite3cc_la_DEPENDENCIES) 
 
301
libsqlite3cc.la: $(libsqlite3cc_la_OBJECTS) $(libsqlite3cc_la_DEPENDENCIES) 
310
302
        $(libsqlite3cc_la_LINK) -rpath $(libdir) $(libsqlite3cc_la_OBJECTS) $(libsqlite3cc_la_LIBADD) $(LIBS)
311
303
 
312
304
mostlyclean-compile:
317
309
 
318
310
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic_statement.Plo@am__quote@
319
311
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command.Plo@am__quote@
320
 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connection.Plo@am__quote@
 
312
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/database.Plo@am__quote@
321
313
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exception.Plo@am__quote@
322
314
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/manipulator.Plo@am__quote@
323
315
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/query.Plo@am__quote@
451
443
 
452
444
installcheck: installcheck-am
453
445
install-strip:
454
 
        if test -z '$(STRIP)'; then \
455
 
          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
456
 
            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
457
 
              install; \
458
 
        else \
459
 
          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
460
 
            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
461
 
            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
462
 
        fi
 
446
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 
447
          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 
448
          `test -z '$(STRIP)' || \
 
449
            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
463
450
mostlyclean-generic:
464
451
 
465
452
clean-generic: