← 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-11-03 21:00:47 UTC
  • mfrom: (520.9.5 devel)
  • Revision ID: brian@tangent.org-20081103210047-wfkeyyefrfl2vh4l
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/Makefile.am
34
34
bin_SCRIPTS =   drizzledumpslow \
35
35
                drizzled_safe 
36
36
 
37
 
AM_CPPFLAGS = ${GLOBAL_CPPFLAGS} ${LIBEVENT_CPPFLAGS} 
 
37
AM_CPPFLAGS = ${GLOBAL_CPPFLAGS} ${LIBEVENT_CPPFLAGS} ${PROTOBUF_CPPFLAGS}
38
38
 
39
39
DTRACE = @DTRACE@
40
40
 
74
74
                 $(top_builddir)/drizzled/field/libfield.la \
75
75
                 $(top_builddir)/drizzled/serialize/libserialize.la \
76
76
                 $(top_builddir)/drizzled/functions/libfunctions.la \
 
77
                 $(top_builddir)/drizzled/util/libutil.la \
77
78
                 $(libevent_libs) \
78
79
                 @mysql_plugin_libs@ \
79
80
                 -lprotobuf \
80
81
                 $(LDADD) \
81
82
                 $(CXXLDFLAGS) \
82
 
                 $(LIBDL_LIBS) $(LIBEVENT_LIBS)
 
83
                 $(LIBDL_LIBS) $(LIBEVENT_LIBS) $(PROTOBUF_LIBS)
83
84
drizzled_DEPENDENCIES = @mysql_plugin_libs@
84
85
 
85
86
drizzled_LDFLAGS =