← 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: 2008-10-16 20:02:16 UTC
  • mfrom: (511.1.9 codestyle)
  • Revision ID: monty@inaugust.com-20081016200216-dvp7f7xx6k5wppkl
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/Makefile.am
53
53
                                plugin_logging.h \
54
54
                                plugin_authentication.h
55
55
 
56
 
noinst_LTLIBRARIES = libhandler.la
 
56
noinst_LTLIBRARIES = libhandler.la libyacc.la
57
57
 
58
58
LDADD = $(top_builddir)/libdrizzle/libdrizzle.la \
59
59
        $(top_builddir)/mysys/libmysys.la \
60
60
        $(top_builddir)/mystrings/libmystrings.la \
61
61
        $(ZLIB_LIBS) $(LIBINTL)
62
62
 
63
 
drizzled_LDADD = libhandler.la \
 
63
drizzled_LDADD = libhandler.la libyacc.la \
64
64
                 $(top_builddir)/libdrizzle/libdrizzle.la \
65
65
                 $(top_builddir)/drizzled/field/libfield.la \
66
66
                 $(top_builddir)/drizzled/serialize/libserialize.la \
184
184
                   scheduler.cc \
185
185
                   sql_parse.cc \
186
186
                   set_var.cc \
187
 
                   sql_yacc.yy \
188
187
                   sql_base.cc \
189
188
                   table.cc \
190
189
                   sql_select.cc \
235
234
                   sql_builtin.cc 
236
235
 
237
236
libhandler_la_SOURCES = handler.cc
 
237
libyacc_la_SOURCES = sql_yacc.yy
 
238
# Code output from YAC contains GOBS of unused macros, and I can't
 
239
# figure out how to turn it off.
 
240
libyacc_la_CXXFLAGS = ${AM_CXXFLAGS} -Wno-unused-macros
 
241
 
238
242
 
239
243
if HAVE_DTRACE
240
244
drizzled_SOURCES += probes.d