← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/plugin.am

  • Committer: Monty Taylor
  • Date: 2010-12-26 03:00:37 UTC
  • mto: This revision was merged to the branch mainline in revision 2038.
  • Revision ID: mordred@inaugust.com-20101226030037-2qcfxg5ryamekd56
Cleaned through ha0ha.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/plugin.am
100
100
                 plugin/innobase/include/mtr0mtr.h \
101
101
                 plugin/innobase/include/mtr0mtr.ic \
102
102
                 plugin/innobase/include/mtr0types.h \
 
103
                 plugin/innobase/include/mysql_addons.h \
103
104
                 plugin/innobase/include/os0file.h \
104
105
                 plugin/innobase/include/os0file.ic \
105
106
                 plugin/innobase/include/os0proc.h \
224
225
                     plugin/innobase/libpars.la
225
226
endif
226
227
 
227
 
plugin_innobase_libinnobase_la_CXXFLAGS=${AM_CXXFLAGS} ${INNOBASE_SKIP_WARNINGS} -I${top_builddir}/plugin/innobase/include -I$(top_srcdir)/plugin/innobase/include -DBUILD_DRIZZLE
228
 
plugin_innobase_libinnobase_la_LDDADD= ${LTLIBAIO}
 
228
plugin_innobase_libinnobase_la_CFLAGS=  ${AM_CFLAGS} ${INNOBASE_SKIP_WARNINGS} -I${top_builddir}/plugin/innobase/include -I$(top_srcdir)/plugin/innobase/include -DBUILD_DRIZZLE
 
229
plugin_innobase_libinnobase_la_CXXFLAGS=${AM_CXXFLAGS} ${PERMISSIVE_WARNINGS} ${INNOBASE_SKIP_WARNINGS} -I${top_builddir}/plugin/innobase/include -I$(top_srcdir)/plugin/innobase/include -DBUILD_DRIZZLE
229
230
plugin_innobase_libinnobase_la_SOURCES= \
230
231
                                        plugin/innobase/btr/btr0btr.cc \
231
232
                                        plugin/innobase/btr/btr0cur.cc \
319
320
# and unused/undefeind stuf, but are generated anyway 
320
321
plugin_innobase_libpars_la_CFLAGS= \
321
322
                                   ${AM_CFLAGS} \
322
 
                                   ${PERMISSIVE_C_WARNINGS} \
323
 
                                   -DUNIV_NONINL \
 
323
                                   ${NO_WERROR} \
324
324
                                   -I$(top_builddir)/plugin/innobase/include \
325
325
                                   -I$(top_srcdir)/plugin/innobase/include \
326
326
                                   -DBUILD_DRIZZLE
327
327
plugin_innobase_libpars_la_CXXFLAGS= \
328
328
                                     ${AM_CXXFLAGS} \
329
329
                                     ${PERMISSIVE_WARNINGS} \
 
330
                                     ${INNOBASE_SKIP_WARNINGS} \
 
331
                                     ${NO_WERROR} \
330
332
                                     -I$(top_builddir)/plugin/innobase/include \
331
333
                                     -I$(top_srcdir)/plugin/innobase/include \
332
334
                                     -DBUILD_DRIZZLE