← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/Makefile.am

  • Committer: Monty Taylor
  • Date: 2009-03-06 00:53:15 UTC
  • mfrom: (910.5.3 tbb-atomics)
  • mto: (916.1.2 merge)
  • mto: This revision was merged to the branch mainline in revision 918.
  • Revision ID: mordred@inaugust.com-20090306005315-al5x7cp5pr7uhoc5
Merged in tbb-atomics without krow's atomic2 patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/Makefile.am
30
30
nobase_dist_drizzledinclude_HEADERS = \
31
31
                alter_column.h \
32
32
                alter_drop.h \
 
33
                atomic/gcc_traits.h \
 
34
                atomic/pthread_traits.h \
 
35
                atomic/sun_studio.h \
 
36
                atomics.h \
33
37
                authentication.h \
34
38
                base.h \
35
39
                cached_item.h \
354
358
                 $(top_builddir)/drizzled/serialize/libserialize.la \
355
359
                 @mysql_plugin_libs@ \
356
360
                 $(LDADD) $(LIBUUID) ${top_builddir}/gnulib/libgnu.la \
357
 
                 $(LIBDL_LIBS) $(LIBPROTOBUF) $(LIBPCRE) \
 
361
                 $(LIBDL_LIBS) $(LIBPROTOBUF) $(LIBPCRE) $(LIBTBB) \
358
362
                 $(DRIZZLED_PLUGIN_DEP_LIBS)
359
363
drizzled_DEPENDENCIES = @mysql_plugin_libs@ ${noinst_LTLIBRARIES}
360
364