~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/Makefile.am

Committer: Lee
Date: 2008-12-16 01:13:54 UTC
mfrom: (685 testable)
mto: (685.1.11 devel) (754.1.1 devel) (758.1.3 devel)
mto: This revision was merged to the branch mainline in revision 713.
Revision ID: lbieber@lbieber-desktop-20081216011354-ugn5irhnd39onopa

merge with latest from the trunk

files modified:
drizzled/Makefile.am

drizzled/sql_base.cc

drizzled/sql_delete.cc

drizzled/sql_list.h

drizzled/sql_select.cc

drizzled/sql_string.h

drizzled/sql_table.cc

drizzled/sql_update.cc

drizzled/uniques.cc

plugin/replicator/Makefile.am

plugin/replicator/replicator.cc

Show diffs side-by-side

added added

removed removed

drizzled/Makefile.am

534

535

536

libfield_la_CXXFLAGS = ${AM_CXXFLAGS}

537

libfield_la_LIBADD= libutil.la

537

538

libfield_la_SOURCES = \

538

539

field/blob.cc \

539

540

field/date.cc \

554

555

556

557

libfunction_la_CPPFLAGS = ${GLOBAL_CPPFLAGS} ${PROTOBUF_CFLAGS}

558

libfunction_la_LIBADD= libutil.la

557

559

libfunction_la_SOURCES = \

558

560

function/abs.cc \

559

561

function/acos.cc \

Older »