~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/plugin.am

  • Committer: Brian Aker
  • Date: 2010-10-15 01:23:36 UTC
  • mfrom: (1835.1.7 staging)
  • Revision ID: brian@tangent.org-20101015012336-8w5lox9kj0hkv0a1
Merge in mutable/execute

Show diffs side-by-side

added added

removed removed

Lines of Context:
43
43
                 plugin/innobase/include/db0err.h \
44
44
                 plugin/innobase/include/dict0boot.h \
45
45
                 plugin/innobase/include/dict0boot.ic \
46
 
                 plugin/innobase/include/create_replication.h \
47
 
                 plugin/innobase/include/read_replication.h \
48
46
                 plugin/innobase/include/dict0crea.h \
49
47
                 plugin/innobase/include/dict0crea.ic \
50
48
                 plugin/innobase/include/dict0dict.h \
100
98
                 plugin/innobase/include/mtr0mtr.h \
101
99
                 plugin/innobase/include/mtr0mtr.ic \
102
100
                 plugin/innobase/include/mtr0types.h \
 
101
                 plugin/innobase/include/mysql_addons.h \
103
102
                 plugin/innobase/include/os0file.h \
104
 
                 plugin/innobase/include/os0file.ic \
105
103
                 plugin/innobase/include/os0proc.h \
106
104
                 plugin/innobase/include/os0proc.ic \
107
105
                 plugin/innobase/include/os0sync.h \
157
155
                 plugin/innobase/include/row0upd.ic \
158
156
                 plugin/innobase/include/row0vers.h \
159
157
                 plugin/innobase/include/row0vers.ic \
 
158
                 plugin/innobase/include/srv0que.h \
160
159
                 plugin/innobase/include/srv0srv.h \
161
160
                 plugin/innobase/include/srv0srv.ic \
162
161
                 plugin/innobase/include/srv0start.h \
190
189
                 plugin/innobase/include/usr0sess.h \
191
190
                 plugin/innobase/include/usr0sess.ic \
192
191
                 plugin/innobase/include/usr0types.h \
 
192
                 plugin/innobase/include/ut0auxconf.h \
193
193
                 plugin/innobase/include/ut0byte.h \
194
194
                 plugin/innobase/include/ut0byte.ic \
195
195
                 plugin/innobase/include/ut0dbg.h \
196
196
                 plugin/innobase/include/ut0lst.h \
197
197
                 plugin/innobase/include/ut0mem.h \
198
198
                 plugin/innobase/include/ut0mem.ic \
199
 
                 plugin/innobase/include/ut0rbt.h \
200
199
                 plugin/innobase/include/ut0rnd.h \
201
200
                 plugin/innobase/include/ut0rnd.ic \
202
201
                 plugin/innobase/include/ut0sort.h \
209
208
                 plugin/innobase/include/ut0wqueue.h \
210
209
                 plugin/innobase/include/ha_prototypes.h \
211
210
                 plugin/innobase/include/handler0alter.h \
212
 
                 plugin/innobase/mem/mem0dbg.cc \
 
211
                 plugin/innobase/mem/mem0dbg.c \
213
212
                 plugin/innobase/handler/ha_innodb.h \
214
213
                 plugin/innobase/handler/handler0vars.h \
215
214
                 plugin/innobase/handler/status_function.h \
216
215
                 plugin/innobase/handler/internal_dictionary.h \
217
 
                 plugin/innobase/handler/replication_dictionary.h \
218
 
                 plugin/innobase/handler/replication_log.h \
219
216
                 plugin/innobase/handler/data_dictionary.h
220
217
 
221
218
if BUILD_INNOBASE_PLUGIN
224
221
                     plugin/innobase/libpars.la
225
222
endif
226
223
 
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}
 
224
plugin_innobase_libinnobase_la_CFLAGS=  ${AM_CFLAGS} ${INNOBASE_SKIP_WARNINGS} -I$(top_srcdir)/plugin/innobase/include -DBUILD_DRIZZLE
 
225
plugin_innobase_libinnobase_la_CXXFLAGS=${AM_CXXFLAGS} ${INNOBASE_SKIP_WARNINGS} -I$(top_srcdir)/plugin/innobase/include -DBUILD_DRIZZLE
229
226
plugin_innobase_libinnobase_la_SOURCES= \
230
 
                                        plugin/innobase/btr/btr0btr.cc \
231
 
                                        plugin/innobase/btr/btr0cur.cc \
232
 
                                        plugin/innobase/btr/btr0pcur.cc \
233
 
                                        plugin/innobase/btr/btr0sea.cc \
234
 
                                        plugin/innobase/buf/buf0buddy.cc \
235
 
                                        plugin/innobase/buf/buf0buf.cc \
236
 
                                        plugin/innobase/buf/buf0flu.cc  \
237
 
                                        plugin/innobase/buf/buf0lru.cc \
238
 
                                        plugin/innobase/buf/buf0rea.cc \
239
 
                                        plugin/innobase/data/data0data.cc \
240
 
                                        plugin/innobase/data/data0type.cc \
241
 
                                        plugin/innobase/dict/dict0boot.cc \
242
 
                                        plugin/innobase/dict/create_replication.cc \
243
 
                                        plugin/innobase/dict/dict0crea.cc \
244
 
                                        plugin/innobase/dict/dict0dict.cc \
245
 
                                        plugin/innobase/dict/dict0load.cc \
246
 
                                        plugin/innobase/dict/dict0mem.cc \
247
 
                                        plugin/innobase/dyn/dyn0dyn.cc  \
248
 
                                        plugin/innobase/eval/eval0eval.cc \
249
 
                                        plugin/innobase/eval/eval0proc.cc \
250
 
                                        plugin/innobase/fil/fil0fil.cc \
251
 
                                        plugin/innobase/fsp/fsp0fsp.cc \
252
 
                                        plugin/innobase/fut/fut0fut.cc  \
253
 
                                        plugin/innobase/fut/fut0lst.cc \
254
 
                                        plugin/innobase/ha/ha0ha.cc \
255
 
                                        plugin/innobase/ha/ha0storage.cc \
256
 
                                        plugin/innobase/ha/hash0hash.cc \
257
 
                                        plugin/innobase/ibuf/ibuf0ibuf.cc \
258
 
                                        plugin/innobase/lock/lock0iter.cc \
259
 
                                        plugin/innobase/lock/lock0lock.cc \
260
 
                                        plugin/innobase/log/log0log.cc \
261
 
                                        plugin/innobase/log/log0recv.cc \
262
 
                                        plugin/innobase/mach/mach0data.cc \
263
 
                                        plugin/innobase/mem/mem0mem.cc \
264
 
                                        plugin/innobase/mem/mem0pool.cc \
265
 
                                        plugin/innobase/mtr/mtr0log.cc  \
266
 
                                        plugin/innobase/mtr/mtr0mtr.cc \
267
 
                                        plugin/innobase/os/os0file.cc \
268
 
                                        plugin/innobase/os/os0proc.cc \
269
 
                                        plugin/innobase/os/os0sync.cc \
270
 
                                        plugin/innobase/os/os0thread.cc \
271
 
                                        plugin/innobase/page/page0cur.cc \
272
 
                                        plugin/innobase/page/page0page.cc \
273
 
                                        plugin/innobase/page/page0zip.cc \
274
 
                                        plugin/innobase/pars/pars0opt.cc \
275
 
                                        plugin/innobase/pars/pars0pars.cc \
276
 
                                        plugin/innobase/pars/pars0sym.cc \
277
 
                                        plugin/innobase/que/que0que.cc \
278
 
                                        plugin/innobase/read/read0read.cc \
279
 
                                        plugin/innobase/rem/rem0cmp.cc \
280
 
                                        plugin/innobase/rem/rem0rec.cc \
281
 
                                        plugin/innobase/row/row0ext.cc  \
282
 
                                        plugin/innobase/row/row0ins.cc \
283
 
                                        plugin/innobase/row/row0merge.cc \
284
 
                                        plugin/innobase/row/row0mysql.cc \
285
 
                                        plugin/innobase/row/row0purge.cc \
286
 
                                        plugin/innobase/row/row0row.cc  \
287
 
                                        plugin/innobase/row/row0sel.cc \
288
 
                                        plugin/innobase/row/row0uins.cc \
289
 
                                        plugin/innobase/row/row0umod.cc \
290
 
                                        plugin/innobase/row/row0undo.cc \
291
 
                                        plugin/innobase/row/row0upd.cc \
292
 
                                        plugin/innobase/row/row0vers.cc \
293
 
                                        plugin/innobase/srv/srv0srv.cc \
294
 
                                        plugin/innobase/srv/srv0start.cc \
295
 
                                        plugin/innobase/sync/sync0arr.cc \
296
 
                                        plugin/innobase/sync/sync0rw.cc \
297
 
                                        plugin/innobase/sync/sync0sync.cc \
298
 
                                        plugin/innobase/thr/thr0loc.cc  \
299
 
                                        plugin/innobase/trx/trx0i_s.cc  \
300
 
                                        plugin/innobase/trx/trx0purge.cc \
301
 
                                        plugin/innobase/trx/trx0rec.cc \
302
 
                                        plugin/innobase/trx/trx0roll.cc \
303
 
                                        plugin/innobase/trx/trx0rseg.cc \
304
 
                                        plugin/innobase/trx/trx0sys.cc \
305
 
                                        plugin/innobase/trx/trx0trx.cc \
306
 
                                        plugin/innobase/trx/trx0undo.cc \
307
 
                                        plugin/innobase/usr/usr0sess.cc \
308
 
                                        plugin/innobase/ut/ut0byte.cc \
309
 
                                        plugin/innobase/ut/ut0dbg.cc \
310
 
                                        plugin/innobase/ut/ut0list.cc \
311
 
                                        plugin/innobase/ut/ut0mem.cc \
312
 
                                        plugin/innobase/ut/ut0rbt.cc \
313
 
                                        plugin/innobase/ut/ut0rnd.cc \
314
 
                                        plugin/innobase/ut/ut0ut.cc \
315
 
                                        plugin/innobase/ut/ut0vec.cc \
316
 
                                        plugin/innobase/ut/ut0wqueue.cc
 
227
                                        plugin/innobase/btr/btr0btr.c \
 
228
                                        plugin/innobase/btr/btr0cur.c \
 
229
                                        plugin/innobase/btr/btr0pcur.c \
 
230
                                        plugin/innobase/btr/btr0sea.c \
 
231
                                        plugin/innobase/buf/buf0buddy.c \
 
232
                                        plugin/innobase/buf/buf0buf.c \
 
233
                                        plugin/innobase/buf/buf0flu.c   \
 
234
                                        plugin/innobase/buf/buf0lru.c \
 
235
                                        plugin/innobase/buf/buf0rea.c \
 
236
                                        plugin/innobase/data/data0data.c \
 
237
                                        plugin/innobase/data/data0type.c \
 
238
                                        plugin/innobase/dict/dict0boot.c \
 
239
                                        plugin/innobase/dict/dict0crea.c \
 
240
                                        plugin/innobase/dict/dict0dict.c \
 
241
                                        plugin/innobase/dict/dict0load.c \
 
242
                                        plugin/innobase/dict/dict0mem.c \
 
243
                                        plugin/innobase/dyn/dyn0dyn.c   \
 
244
                                        plugin/innobase/eval/eval0eval.c \
 
245
                                        plugin/innobase/eval/eval0proc.c \
 
246
                                        plugin/innobase/fil/fil0fil.c \
 
247
                                        plugin/innobase/fsp/fsp0fsp.c \
 
248
                                        plugin/innobase/fut/fut0fut.c   \
 
249
                                        plugin/innobase/fut/fut0lst.c \
 
250
                                        plugin/innobase/ha/ha0ha.c \
 
251
                                        plugin/innobase/ha/ha0storage.c \
 
252
                                        plugin/innobase/ha/hash0hash.c \
 
253
                                        plugin/innobase/ibuf/ibuf0ibuf.c \
 
254
                                        plugin/innobase/lock/lock0iter.c \
 
255
                                        plugin/innobase/lock/lock0lock.c \
 
256
                                        plugin/innobase/log/log0log.c \
 
257
                                        plugin/innobase/log/log0recv.c \
 
258
                                        plugin/innobase/mach/mach0data.c \
 
259
                                        plugin/innobase/mem/mem0mem.c \
 
260
                                        plugin/innobase/mem/mem0pool.c \
 
261
                                        plugin/innobase/mtr/mtr0log.c   \
 
262
                                        plugin/innobase/mtr/mtr0mtr.c \
 
263
                                        plugin/innobase/os/os0file.c \
 
264
                                        plugin/innobase/os/os0proc.c \
 
265
                                        plugin/innobase/os/os0sync.c \
 
266
                                        plugin/innobase/os/os0thread.c \
 
267
                                        plugin/innobase/page/page0cur.c \
 
268
                                        plugin/innobase/page/page0page.c \
 
269
                                        plugin/innobase/page/page0zip.c \
 
270
                                        plugin/innobase/pars/pars0opt.c \
 
271
                                        plugin/innobase/pars/pars0pars.c \
 
272
                                        plugin/innobase/pars/pars0sym.c \
 
273
                                        plugin/innobase/que/que0que.c \
 
274
                                        plugin/innobase/read/read0read.c \
 
275
                                        plugin/innobase/rem/rem0cmp.c \
 
276
                                        plugin/innobase/rem/rem0rec.c \
 
277
                                        plugin/innobase/row/row0ext.c   \
 
278
                                        plugin/innobase/row/row0ins.c \
 
279
                                        plugin/innobase/row/row0merge.c \
 
280
                                        plugin/innobase/row/row0mysql.c \
 
281
                                        plugin/innobase/row/row0purge.c \
 
282
                                        plugin/innobase/row/row0row.c   \
 
283
                                        plugin/innobase/row/row0sel.c \
 
284
                                        plugin/innobase/row/row0uins.c \
 
285
                                        plugin/innobase/row/row0umod.c \
 
286
                                        plugin/innobase/row/row0undo.c \
 
287
                                        plugin/innobase/row/row0upd.c \
 
288
                                        plugin/innobase/row/row0vers.c \
 
289
                                        plugin/innobase/srv/srv0que.c \
 
290
                                        plugin/innobase/srv/srv0srv.c \
 
291
                                        plugin/innobase/srv/srv0start.c \
 
292
                                        plugin/innobase/sync/sync0arr.c \
 
293
                                        plugin/innobase/sync/sync0rw.c \
 
294
                                        plugin/innobase/sync/sync0sync.c \
 
295
                                        plugin/innobase/thr/thr0loc.c   \
 
296
                                        plugin/innobase/trx/trx0i_s.c   \
 
297
                                        plugin/innobase/trx/trx0purge.c \
 
298
                                        plugin/innobase/trx/trx0rec.c \
 
299
                                        plugin/innobase/trx/trx0roll.c \
 
300
                                        plugin/innobase/trx/trx0rseg.c \
 
301
                                        plugin/innobase/trx/trx0sys.c \
 
302
                                        plugin/innobase/trx/trx0trx.c \
 
303
                                        plugin/innobase/trx/trx0undo.c \
 
304
                                        plugin/innobase/usr/usr0sess.c \
 
305
                                        plugin/innobase/ut/ut0byte.c \
 
306
                                        plugin/innobase/ut/ut0dbg.c \
 
307
                                        plugin/innobase/ut/ut0list.c \
 
308
                                        plugin/innobase/ut/ut0mem.c \
 
309
                                        plugin/innobase/ut/ut0rnd.c \
 
310
                                        plugin/innobase/ut/ut0ut.c \
 
311
                                        plugin/innobase/ut/ut0vec.c \
 
312
                                        plugin/innobase/ut/ut0wqueue.c
317
313
 
318
 
# pars0lex.c and pars0grm.cc have lots of redundant decls 
 
314
# pars0lex.c and pars0grm.c have lots of redundant decls 
319
315
# and unused/undefeind stuf, but are generated anyway 
320
 
plugin_innobase_libpars_la_CFLAGS= \
321
 
                                   ${AM_CFLAGS} \
322
 
                                   ${PERMISSIVE_C_WARNINGS} \
323
 
                                   -DUNIV_NONINL \
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
 
                                     -I$(top_builddir)/plugin/innobase/include \
331
 
                                     -I$(top_srcdir)/plugin/innobase/include \
332
 
                                     -DBUILD_DRIZZLE
333
 
 
334
 
plugin_innobase_libpars_la_SOURCES= \
335
 
                                    plugin/innobase/pars/pars0lex.c \
336
 
                                    plugin/innobase/pars/pars0grm.cc
 
316
plugin_innobase_libpars_la_CFLAGS=      ${AM_CFLAGS} ${NO_WERROR} \
 
317
                        -I$(top_srcdir)/plugin/innobase/include \
 
318
                        -DBUILD_DRIZZLE
 
319
plugin_innobase_libpars_la_SOURCES=     plugin/innobase/pars/pars0lex.c \
 
320
                        plugin/innobase/pars/pars0grm.c
337
321
 
338
322
plugin_innobase_libinnobase_la_LIBADD=  plugin/innobase/libpars.la
339
323
 
340
 
plugin/innobase/pars/pars0grm.cc: plugin/innobase/pars/pars0grm.y
341
 
        $(AM_V_GEN) $(YACC) -d $< -o plugin/innobase/pars/pars0grm.tab.cc
342
 
        @mkdir -p plugin/innobase/include
343
 
        @mv plugin/innobase/pars/pars0grm.tab.hh plugin/innobase/include/pars0grm.hh
344
 
        @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
345
 
        @rm plugin/innobase/pars/pars0grm.tab.cc
 
324
plugin/innobase/pars/pars0grm.c: plugin/innobase/pars/pars0grm.y
 
325
        $(AM_V_GEN) $(YACC) -d plugin/innobase/pars/pars0grm.y -o plugin/innobase/pars/pars0grm.tab.c
 
326
        @mv plugin/innobase/pars/pars0grm.tab.h plugin/innobase/include/pars0grm.h
 
327
        @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
 
328
        @rm plugin/innobase/pars/pars0grm.tab.c
346
329
 
347
 
plugin/innobase/include/pars0grm.hh: plugin/innobase/pars/pars0grm.cc
 
330
plugin/innobase/include/pars0grm.h: plugin/innobase/pars/pars0grm.c
348
331
        @if test ! -f $@; then \
349
332
          rm -f $<; \
350
333
          $(MAKE) $(AM_MAKEFLAGS) $<; \
375
358
 
376
359
BUILT_MAINT_SRC+= \
377
360
             plugin/innobase/pars/pars0lex.c \
378
 
             plugin/innobase/pars/pars0grm.cc \
379
 
             plugin/innobase/include/pars0grm.hh
 
361
             plugin/innobase/pars/pars0grm.c \
 
362
             plugin/innobase/include/pars0grm.h
380
363
 
381
364
EXTRA_DIST+= \
382
365
             plugin/innobase/CMakeLists.txt \
383
366
             plugin/innobase/pars/pars0grm.y \
384
 
             plugin/innobase/pars/pars0lex.l
 
367
             plugin/innobase/pars/pars0lex.l \
 
368
             plugin/innobase/ut/ut0auxconf_atomic_pthread_t_gcc.c \
 
369
             plugin/innobase/ut/ut0auxconf_atomic_pthread_t_solaris.c \
 
370
             plugin/innobase/ut/ut0auxconf_have_solaris_atomics.c \
 
371
             plugin/innobase/ut/ut0auxconf_pause.c \
 
372
             plugin/innobase/ut/ut0auxconf_sizeof_pthread_t.c
 
373
 
385
374