~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/Makefile.am

  • Committer: Monty Taylor
  • Date: 2008-08-12 20:00:50 UTC
  • mfrom: (319 drizzle)
  • mto: This revision was merged to the branch mainline in revision 322.
  • Revision ID: monty@inaugust.com-20080812200050-es52qlky5en7411w
MergedĀ fromĀ trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
25
25
 
26
26
pkgplugindir =$(pkglibdir)/plugin
27
27
 
28
 
SUBDIRS = field  . share
 
28
SUBDIRS = field serialize  . share
29
29
 
30
30
sbin_PROGRAMS =drizzled
31
31
 
65
65
drizzled_LDADD = libhandler.la \
66
66
                 $(top_builddir)/libdrizzle/libdrizzle.la \
67
67
                 $(top_builddir)/drizzled/field/libfield.la \
 
68
                 $(top_builddir)/drizzled/serialize/libserialize.la \
68
69
                 $(libevent_libs) \
69
70
                 @mysql_plugin_libs@ \
 
71
                 -lprotobuf \
70
72
                 $(LDADD) \
71
73
                 $(CXXLDFLAGS) \
72
74
                 $(LIBDL_LIBS) $(LIBEVENT_LIBS)
129
131
                 base.h \
130
132
                 probes.h
131
133
 
132
 
drizzled_SOURCES = sql_lex.cc \
 
134
drizzled_SOURCES = \
 
135
                   sql_db.cc \
 
136
                   sql_lex.cc \
133
137
                   authentication.cc \
134
138
                   sql_handler.cc \
135
139
                   item.cc \
180
184
                   opt_sum.cc \
181
185
                   records.cc \
182
186
                   filesort.cc \
183
 
                   sql_db.cc \
184
187
                   sql_table.cc \
185
188
                   sql_rename.cc \
186
189
                   sql_load.cc \