← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/plugin.am

Merge Monty - Added inter-plugin dependencies for controlling plugin load order

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 \
209
210
                 plugin/innobase/include/ut0wqueue.h \
210
211
                 plugin/innobase/include/ha_prototypes.h \
211
212
                 plugin/innobase/include/handler0alter.h \
212
 
                 plugin/innobase/include/xtrabackup_api.h \
213
213
                 plugin/innobase/mem/mem0dbg.cc \
214
214
                 plugin/innobase/handler/ha_innodb.h \
215
215
                 plugin/innobase/handler/handler0vars.h \
223
223
noinst_LTLIBRARIES+= \
224
224
                     plugin/innobase/libinnobase.la \
225
225
                     plugin/innobase/libpars.la
226
 
bin_PROGRAMS+= plugin/innobase/xtrabackup/drizzlebackup.innobase
227
226
endif
228
227
 
229
 
plugin_innobase_xtrabackup_drizzlebackup_innobase_SOURCES = plugin/innobase/xtrabackup/xtrabackup.cc
230
 
plugin_innobase_xtrabackup_drizzlebackup_innobase_LDADD = \
231
 
        plugin/innobase/libinnobase.la \
232
 
        drizzled/internal/libinternal.la \
233
 
        drizzled/libcharset.la \
234
 
        $(BOOST_LIBS) \
235
 
        ${LTLIBAIO} \
236
 
        $(LIBZ)
237
 
 
238
 
plugin_innobase_xtrabackup_drizzlebackup_innobase_CXXFLAGS=${AM_CXXFLAGS} ${INNOBASE_SKIP_WARNINGS} -I${top_builddir}/plugin/innobase/include -I$(top_srcdir)/plugin/innobase/include -DBUILD_DRIZZLE
239
 
 
240
228
plugin_innobase_libinnobase_la_CXXFLAGS=${AM_CXXFLAGS} ${INNOBASE_SKIP_WARNINGS} -I${top_builddir}/plugin/innobase/include -I$(top_srcdir)/plugin/innobase/include -DBUILD_DRIZZLE
241
229
plugin_innobase_libinnobase_la_LDDADD= ${LTLIBAIO}
242
230
plugin_innobase_libinnobase_la_SOURCES= \