← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/Makefile.am

Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/Makefile.am
269
269
                order.h \
270
270
                plugin.h \
271
271
                plugin_registry.h \
272
 
                plugin_registry_impl.h \
 
272
                plugin/applier.h \
273
273
                plugin/authentication.h \
274
274
                plugin/error_message_handler.h \
275
275
                plugin/logging_handler.h \
283
283
                qcache.h \
284
284
                query_arena.h \
285
285
                query_id.h \
 
286
                registry.h \
286
287
                rename.h \
287
 
                replicator.h \
 
288
                transaction_services.h \
288
289
                scheduling.h \
289
290
                security_context.h \
290
291
                select_create.h \
351
352
 
352
353
LDADD = $(top_builddir)/mysys/libmysys.la \
353
354
        $(top_builddir)/mystrings/libmystrings.la \
354
 
        $(LIBDRIZZLE) $(LIBZ) $(LIBINTL) ${LIBC_P}
 
355
        $(LTLIBDRIZZLE) $(LIBZ) $(LIBINTL) ${LIBC_P}
355
356
 
356
357
drizzled_LDADD = ${noinst_LTLIBRARIES} \
357
 
                 $(top_builddir)/drizzled/serialize/libserialize.la \
 
358
                 $(top_builddir)/drizzled/message/libdrizzledmessage.la \
358
359
                 @mysql_plugin_libs@ \
359
360
                 $(LDADD) $(LIBUUID) ${top_builddir}/gnulib/libgnu.la \
360
361
                 $(LIBDL_LIBS) $(LIBPROTOBUF) $(LIBPCRE) $(LIBTBB) \
567
568
                item.cc \
568
569
                key.cc \
569
570
                lock.cc \
570
 
                log.cc \
571
571
                logging.cc \
572
572
                lookup_symbol.cc \
573
573
                my_decimal.cc \
576
576
                opt_range.cc \
577
577
                opt_sum.cc \
578
578
                plugin_registry.cc \
579
 
                plugin_registry_impl.cc \
580
579
                protocol.cc \
581
580
                qcache.cc \
582
581
                query_id.cc \
583
582
                records.cc \
584
583
                rename.cc \
585
 
                replicator.cc \
586
 
                scheduling.cc \
 
584
                transaction_services.cc \
 
585
    scheduling.cc \
587
586
                session.cc \
588
587
                set_var.cc \
589
588
                show.cc \
590
589
                sj_tmp_table.cc \
591
590
                sql_base.cc \
 
591
                sql_bitmap.cc \
592
592
                sql_builtin.cc \
593
593
                sql_connect.cc \
594
594
                sql_delete.cc \