← 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-24 00:04:05 UTC
  • mto: This revision was merged to the branch mainline in revision 2038.
  • Revision ID: mordred@inaugust.com-20101224000405-pbeo7g3qs2s3xr7c
A stab at C++-izing InnoDB.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/plugin.am
210
210
                 plugin/innobase/include/ut0wqueue.h \
211
211
                 plugin/innobase/include/ha_prototypes.h \
212
212
                 plugin/innobase/include/handler0alter.h \
213
 
                 plugin/innobase/mem/mem0dbg.c \
 
213
                 plugin/innobase/mem/mem0dbg.cc \
214
214
                 plugin/innobase/handler/ha_innodb.h \
215
215
                 plugin/innobase/handler/handler0vars.h \
216
216
                 plugin/innobase/handler/status_function.h \
226
226
endif
227
227
 
228
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} ${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
230
230
plugin_innobase_libinnobase_la_SOURCES= \
231
 
                                        plugin/innobase/btr/btr0btr.c \
232
 
                                        plugin/innobase/btr/btr0cur.c \
233
 
                                        plugin/innobase/btr/btr0pcur.c \
234
 
                                        plugin/innobase/btr/btr0sea.c \
235
 
                                        plugin/innobase/buf/buf0buddy.c \
236
 
                                        plugin/innobase/buf/buf0buf.c \
237
 
                                        plugin/innobase/buf/buf0flu.c   \
238
 
                                        plugin/innobase/buf/buf0lru.c \
239
 
                                        plugin/innobase/buf/buf0rea.c \
240
 
                                        plugin/innobase/data/data0data.c \
241
 
                                        plugin/innobase/data/data0type.c \
242
 
                                        plugin/innobase/dict/dict0boot.c \
243
 
                                        plugin/innobase/dict/create_replication.c \
244
 
                                        plugin/innobase/dict/dict0crea.c \
245
 
                                        plugin/innobase/dict/dict0dict.c \
246
 
                                        plugin/innobase/dict/dict0load.c \
247
 
                                        plugin/innobase/dict/dict0mem.c \
248
 
                                        plugin/innobase/dyn/dyn0dyn.c   \
249
 
                                        plugin/innobase/eval/eval0eval.c \
250
 
                                        plugin/innobase/eval/eval0proc.c \
251
 
                                        plugin/innobase/fil/fil0fil.c \
252
 
                                        plugin/innobase/fsp/fsp0fsp.c \
253
 
                                        plugin/innobase/fut/fut0fut.c   \
254
 
                                        plugin/innobase/fut/fut0lst.c \
255
 
                                        plugin/innobase/ha/ha0ha.c \
256
 
                                        plugin/innobase/ha/ha0storage.c \
257
 
                                        plugin/innobase/ha/hash0hash.c \
258
 
                                        plugin/innobase/ibuf/ibuf0ibuf.c \
259
 
                                        plugin/innobase/lock/lock0iter.c \
260
 
                                        plugin/innobase/lock/lock0lock.c \
261
 
                                        plugin/innobase/log/log0log.c \
262
 
                                        plugin/innobase/log/log0recv.c \
263
 
                                        plugin/innobase/mach/mach0data.c \
264
 
                                        plugin/innobase/mem/mem0mem.c \
265
 
                                        plugin/innobase/mem/mem0pool.c \
266
 
                                        plugin/innobase/mtr/mtr0log.c   \
267
 
                                        plugin/innobase/mtr/mtr0mtr.c \
268
 
                                        plugin/innobase/os/os0file.c \
269
 
                                        plugin/innobase/os/os0proc.c \
270
 
                                        plugin/innobase/os/os0sync.c \
271
 
                                        plugin/innobase/os/os0thread.c \
272
 
                                        plugin/innobase/page/page0cur.c \
273
 
                                        plugin/innobase/page/page0page.c \
274
 
                                        plugin/innobase/page/page0zip.c \
275
 
                                        plugin/innobase/pars/pars0opt.c \
276
 
                                        plugin/innobase/pars/pars0pars.c \
277
 
                                        plugin/innobase/pars/pars0sym.c \
278
 
                                        plugin/innobase/que/que0que.c \
279
 
                                        plugin/innobase/read/read0read.c \
280
 
                                        plugin/innobase/rem/rem0cmp.c \
281
 
                                        plugin/innobase/rem/rem0rec.c \
282
 
                                        plugin/innobase/row/row0ext.c   \
283
 
                                        plugin/innobase/row/row0ins.c \
284
 
                                        plugin/innobase/row/row0merge.c \
285
 
                                        plugin/innobase/row/row0mysql.c \
286
 
                                        plugin/innobase/row/row0purge.c \
287
 
                                        plugin/innobase/row/row0row.c   \
288
 
                                        plugin/innobase/row/row0sel.c \
289
 
                                        plugin/innobase/row/row0uins.c \
290
 
                                        plugin/innobase/row/row0umod.c \
291
 
                                        plugin/innobase/row/row0undo.c \
292
 
                                        plugin/innobase/row/row0upd.c \
293
 
                                        plugin/innobase/row/row0vers.c \
294
 
                                        plugin/innobase/srv/srv0srv.c \
295
 
                                        plugin/innobase/srv/srv0start.c \
296
 
                                        plugin/innobase/sync/sync0arr.c \
297
 
                                        plugin/innobase/sync/sync0rw.c \
298
 
                                        plugin/innobase/sync/sync0sync.c \
299
 
                                        plugin/innobase/thr/thr0loc.c   \
300
 
                                        plugin/innobase/trx/trx0i_s.c   \
301
 
                                        plugin/innobase/trx/trx0purge.c \
302
 
                                        plugin/innobase/trx/trx0rec.c \
303
 
                                        plugin/innobase/trx/trx0roll.c \
304
 
                                        plugin/innobase/trx/trx0rseg.c \
305
 
                                        plugin/innobase/trx/trx0sys.c \
306
 
                                        plugin/innobase/trx/trx0trx.c \
307
 
                                        plugin/innobase/trx/trx0undo.c \
308
 
                                        plugin/innobase/usr/usr0sess.c \
309
 
                                        plugin/innobase/ut/ut0byte.c \
310
 
                                        plugin/innobase/ut/ut0dbg.c \
311
 
                                        plugin/innobase/ut/ut0list.c \
312
 
                                        plugin/innobase/ut/ut0mem.c \
313
 
                                        plugin/innobase/ut/ut0rbt.c \
314
 
                                        plugin/innobase/ut/ut0rnd.c \
315
 
                                        plugin/innobase/ut/ut0ut.c \
316
 
                                        plugin/innobase/ut/ut0vec.c \
317
 
                                        plugin/innobase/ut/ut0wqueue.c
 
231
                                        plugin/innobase/btr/btr0btr.cc \
 
232
                                        plugin/innobase/btr/btr0cur.cc \
 
233
                                        plugin/innobase/btr/btr0pcur.cc \
 
234
                                        plugin/innobase/btr/btr0sea.cc \
 
235
                                        plugin/innobase/buf/buf0buddy.cc \
 
236
                                        plugin/innobase/buf/buf0buf.cc \
 
237
                                        plugin/innobase/buf/buf0flu.cc  \
 
238
                                        plugin/innobase/buf/buf0lru.cc \
 
239
                                        plugin/innobase/buf/buf0rea.cc \
 
240
                                        plugin/innobase/data/data0data.cc \
 
241
                                        plugin/innobase/data/data0type.cc \
 
242
                                        plugin/innobase/dict/dict0boot.cc \
 
243
                                        plugin/innobase/dict/create_replication.cc \
 
244
                                        plugin/innobase/dict/dict0crea.cc \
 
245
                                        plugin/innobase/dict/dict0dict.cc \
 
246
                                        plugin/innobase/dict/dict0load.cc \
 
247
                                        plugin/innobase/dict/dict0mem.cc \
 
248
                                        plugin/innobase/dyn/dyn0dyn.cc  \
 
249
                                        plugin/innobase/eval/eval0eval.cc \
 
250
                                        plugin/innobase/eval/eval0proc.cc \
 
251
                                        plugin/innobase/fil/fil0fil.cc \
 
252
                                        plugin/innobase/fsp/fsp0fsp.cc \
 
253
                                        plugin/innobase/fut/fut0fut.cc  \
 
254
                                        plugin/innobase/fut/fut0lst.cc \
 
255
                                        plugin/innobase/ha/ha0ha.cc \
 
256
                                        plugin/innobase/ha/ha0storage.cc \
 
257
                                        plugin/innobase/ha/hash0hash.cc \
 
258
                                        plugin/innobase/ibuf/ibuf0ibuf.cc \
 
259
                                        plugin/innobase/lock/lock0iter.cc \
 
260
                                        plugin/innobase/lock/lock0lock.cc \
 
261
                                        plugin/innobase/log/log0log.cc \
 
262
                                        plugin/innobase/log/log0recv.cc \
 
263
                                        plugin/innobase/mach/mach0data.cc \
 
264
                                        plugin/innobase/mem/mem0mem.cc \
 
265
                                        plugin/innobase/mem/mem0pool.cc \
 
266
                                        plugin/innobase/mtr/mtr0log.cc  \
 
267
                                        plugin/innobase/mtr/mtr0mtr.cc \
 
268
                                        plugin/innobase/os/os0file.cc \
 
269
                                        plugin/innobase/os/os0proc.cc \
 
270
                                        plugin/innobase/os/os0sync.cc \
 
271
                                        plugin/innobase/os/os0thread.cc \
 
272
                                        plugin/innobase/page/page0cur.cc \
 
273
                                        plugin/innobase/page/page0page.cc \
 
274
                                        plugin/innobase/page/page0zip.cc \
 
275
                                        plugin/innobase/pars/pars0opt.cc \
 
276
                                        plugin/innobase/pars/pars0pars.cc \
 
277
                                        plugin/innobase/pars/pars0sym.cc \
 
278
                                        plugin/innobase/que/que0que.cc \
 
279
                                        plugin/innobase/read/read0read.cc \
 
280
                                        plugin/innobase/rem/rem0cmp.cc \
 
281
                                        plugin/innobase/rem/rem0rec.cc \
 
282
                                        plugin/innobase/row/row0ext.cc  \
 
283
                                        plugin/innobase/row/row0ins.cc \
 
284
                                        plugin/innobase/row/row0merge.cc \
 
285
                                        plugin/innobase/row/row0mysql.cc \
 
286
                                        plugin/innobase/row/row0purge.cc \
 
287
                                        plugin/innobase/row/row0row.cc  \
 
288
                                        plugin/innobase/row/row0sel.cc \
 
289
                                        plugin/innobase/row/row0uins.cc \
 
290
                                        plugin/innobase/row/row0umod.cc \
 
291
                                        plugin/innobase/row/row0undo.cc \
 
292
                                        plugin/innobase/row/row0upd.cc \
 
293
                                        plugin/innobase/row/row0vers.cc \
 
294
                                        plugin/innobase/srv/srv0srv.cc \
 
295
                                        plugin/innobase/srv/srv0start.cc \
 
296
                                        plugin/innobase/sync/sync0arr.cc \
 
297
                                        plugin/innobase/sync/sync0rw.cc \
 
298
                                        plugin/innobase/sync/sync0sync.cc \
 
299
                                        plugin/innobase/thr/thr0loc.cc  \
 
300
                                        plugin/innobase/trx/trx0i_s.cc  \
 
301
                                        plugin/innobase/trx/trx0purge.cc \
 
302
                                        plugin/innobase/trx/trx0rec.cc \
 
303
                                        plugin/innobase/trx/trx0roll.cc \
 
304
                                        plugin/innobase/trx/trx0rseg.cc \
 
305
                                        plugin/innobase/trx/trx0sys.cc \
 
306
                                        plugin/innobase/trx/trx0trx.cc \
 
307
                                        plugin/innobase/trx/trx0undo.cc \
 
308
                                        plugin/innobase/usr/usr0sess.cc \
 
309
                                        plugin/innobase/ut/ut0byte.cc \
 
310
                                        plugin/innobase/ut/ut0dbg.cc \
 
311
                                        plugin/innobase/ut/ut0list.cc \
 
312
                                        plugin/innobase/ut/ut0mem.cc \
 
313
                                        plugin/innobase/ut/ut0rbt.cc \
 
314
                                        plugin/innobase/ut/ut0rnd.cc \
 
315
                                        plugin/innobase/ut/ut0ut.cc \
 
316
                                        plugin/innobase/ut/ut0vec.cc \
 
317
                                        plugin/innobase/ut/ut0wqueue.cc
318
318
 
319
 
# pars0lex.c and pars0grm.c have lots of redundant decls 
 
319
# pars0lex.c and pars0grm.cc have lots of redundant decls 
320
320
# and unused/undefeind stuf, but are generated anyway 
321
 
plugin_innobase_libpars_la_CFLAGS=      ${AM_CFLAGS} ${NO_WERROR} \
322
 
                        -I$(top_builddir)/plugin/innobase/include \
323
 
                        -I$(top_srcdir)/plugin/innobase/include \
324
 
                        -DBUILD_DRIZZLE
 
321
plugin_innobase_libpars_la_CFLAGS= \
 
322
                                   ${AM_CFLAGS} \
 
323
                                   ${NO_WERROR} \
 
324
                                   -I$(top_builddir)/plugin/innobase/include \
 
325
                                   -I$(top_srcdir)/plugin/innobase/include \
 
326
                                   -DBUILD_DRIZZLE
 
327
plugin_innobase_libpars_la_CXXFLAGS= \
 
328
                                     ${AM_CXXFLAGS} \
 
329
                                     ${PERMISSIVE_WARNINGS} \
 
330
                                     ${NO_WERROR} \
 
331
                                     -I$(top_builddir)/plugin/innobase/include \
 
332
                                     -I$(top_srcdir)/plugin/innobase/include \
 
333
                                     -DBUILD_DRIZZLE
325
334
 
326
335
plugin_innobase_libpars_la_SOURCES= \
327
336
                                    plugin/innobase/pars/pars0lex.c \
328
 
                                    plugin/innobase/pars/pars0grm.c
 
337
                                    plugin/innobase/pars/pars0grm.cc
329
338
 
330
339
plugin_innobase_libinnobase_la_LIBADD=  plugin/innobase/libpars.la
331
340
 
332
 
plugin/innobase/pars/pars0grm.c: plugin/innobase/pars/pars0grm.y
333
 
        $(AM_V_GEN) $(YACC) -d $< -o plugin/innobase/pars/pars0grm.tab.c
 
341
plugin/innobase/pars/pars0grm.cc: plugin/innobase/pars/pars0grm.y
 
342
        $(AM_V_GEN) $(YACC) -d $< -o plugin/innobase/pars/pars0grm.tab.cc
334
343
        @mkdir -p plugin/innobase/include
335
 
        @mv plugin/innobase/pars/pars0grm.tab.h plugin/innobase/include/pars0grm.h
336
 
        @sed -e 's/pars0grm.tab.c/pars0grm.c/; s/^\(\(YYSTYPE\|int\) yy\(char\|nerrs\)\)/static \1/; s/\(\(YYSTYPE\|int\) yy\(lval\|parse\)\)/UNIV_INTERN \1/;' < plugin/innobase/pars/pars0grm.tab.c > plugin/innobase/pars/pars0grm.c
337
 
        @rm plugin/innobase/pars/pars0grm.tab.c
 
344
        @mv plugin/innobase/pars/pars0grm.tab.hh plugin/innobase/include/pars0grm.hh
 
345
        @sed -e 's/pars0grm.tab.cc/pars0grm.cc/; s/^\(\(YYSTYPE\|int\) yy\(char\|nerrs\)\)/static \1/; s/\(\(YYSTYPE\|int\) yy\(lval\|parse\)\)/UNIV_INTERN \1/;' < plugin/innobase/pars/pars0grm.tab.cc > plugin/innobase/pars/pars0grm.cc
 
346
        @rm plugin/innobase/pars/pars0grm.tab.cc
338
347
 
339
 
plugin/innobase/include/pars0grm.h: plugin/innobase/pars/pars0grm.c
 
348
plugin/innobase/include/pars0grm.hh: plugin/innobase/pars/pars0grm.cc
340
349
        @if test ! -f $@; then \
341
350
          rm -f $<; \
342
351
          $(MAKE) $(AM_MAKEFLAGS) $<; \
367
376
 
368
377
BUILT_MAINT_SRC+= \
369
378
             plugin/innobase/pars/pars0lex.c \
370
 
             plugin/innobase/pars/pars0grm.c \
371
 
             plugin/innobase/include/pars0grm.h
 
379
             plugin/innobase/pars/pars0grm.cc \
 
380
             plugin/innobase/include/pars0grm.hh
372
381
 
373
382
EXTRA_DIST+= \
374
383
             plugin/innobase/CMakeLists.txt \