← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/Makefile.am

  • Committer: Brian Aker
  • Date: 2008-12-23 08:38:20 UTC
  • mfrom: (722.2.8 devel)
  • Revision ID: brian@tangent.org-20081223083820-035gz83lwl15sd22
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/Makefile.am
90
90
                function/find_in_set.h \
91
91
                function/found_rows.h \
92
92
                function/func.h \
 
93
                function/get_variable.h \
93
94
                function/get_system_var.h \
94
95
                function/get_user_var.h \
95
96
                function/last_insert.h \
105
106
                function/set_user_var.h \
106
107
                function/sign.h \
107
108
                function/signed.h \
 
109
                function/units.h \
108
110
                function/unsigned.h \
 
111
                function/update_hash.h \
109
112
                function/user_var_as_out_param.h \
110
113
                function/math/abs.h \
111
114
                function/math/acos.h \
216
219
                ha_trx_info.h \
217
220
                ha_statistics.h \
218
221
                handler.h \
 
222
                handlerton.h \
219
223
                handler_structs.h \
220
224
                hybrid_type.h \
221
225
                hybrid_type_traits.h \
273
277
                my_decimal.h\
274
278
                name_resolution_context.h \
275
279
                name_resolution_context_state.h \
 
280
                natural_join_column.h \
 
281
                nested_join.h \
276
282
                opt_range.h \
277
283
                order.h \
278
284
                parser.h \
334
340
                tmp_table.h \
335
341
                tzfile.h \
336
342
                tztime.h \
 
343
                unireg.h \
337
344
                virtual_column_info.h \
338
345
                xid.h
339
346
 
348
355
LDADD = $(top_builddir)/libdrizzle/libdrizzle.la \
349
356
        $(top_builddir)/mysys/libmysys.la \
350
357
        $(top_builddir)/mystrings/libmystrings.la \
351
 
        $(Z_LIBS) $(LIBINTL) 
 
358
        $(Z_LIBS) $(LIBINTL)
352
359
 
353
360
drizzled_LDADD = ${noinst_LTLIBRARIES} \
354
361
                 $(top_builddir)/libdrizzle/libdrizzle.la \
358
365
                 -lprotobuf \
359
366
                 $(LDADD) \
360
367
                 $(CXXLDFLAGS) \
361
 
                 $(LIBDL_LIBS) $(EVENT_LIBS) $(PROTOBUF_LIBS)
 
368
                 $(LIBDL_LIBS) $(EVENT_LIBS) $(PROTOBUF_LIBS) \
 
369
                 $(DRIZZLED_PLUGIN_DEP_LIBS)
362
370
drizzled_DEPENDENCIES = @mysql_plugin_libs@ ${noinst_LTLIBRARIES}
363
371
 
364
372
drizzled_LDFLAGS =
401
409
                log_event.cc \
402
410
                logging.cc \
403
411
                mf_iocache.cc \
404
 
                my_decimal.cc\
 
412
                my_decimal.cc \
405
413
                name_resolution_context_state.cc \
406
414
                natural_join_column.cc \
407
415
                opt_range.cc \