← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/plugin.am

  • Committer: Lee Bieber
  • Date: 2010-11-18 02:50:43 UTC
  • mfrom: (1936.1.2 build)
  • Revision ID: kalebral@gmail.com-20101118025043-zhf03hty056lcg4i
Merge Monty - fix bug 676653: out of source tree build failed
Merge Andrew - fix bug 676735: boost::iostreams compile failure in Fedora 14    

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/plugin.am
222
222
                     plugin/innobase/libpars.la
223
223
endif
224
224
 
225
 
plugin_innobase_libinnobase_la_CFLAGS=  ${AM_CFLAGS} ${INNOBASE_SKIP_WARNINGS} -I$(top_srcdir)/plugin/innobase/include -DBUILD_DRIZZLE
226
 
plugin_innobase_libinnobase_la_CXXFLAGS=${AM_CXXFLAGS} ${INNOBASE_SKIP_WARNINGS} -I$(top_srcdir)/plugin/innobase/include -DBUILD_DRIZZLE
 
225
plugin_innobase_libinnobase_la_CFLAGS=  ${AM_CFLAGS} ${INNOBASE_SKIP_WARNINGS} -I${top_builddir}/plugin/innobase/include -I$(top_srcdir)/plugin/innobase/include -DBUILD_DRIZZLE
 
226
plugin_innobase_libinnobase_la_CXXFLAGS=${AM_CXXFLAGS} ${INNOBASE_SKIP_WARNINGS} -I${top_builddir}/plugin/innobase/include -I$(top_srcdir)/plugin/innobase/include -DBUILD_DRIZZLE
227
227
plugin_innobase_libinnobase_la_SOURCES= \
228
228
                                        plugin/innobase/btr/btr0btr.c \
229
229
                                        plugin/innobase/btr/btr0cur.c \
316
316
# pars0lex.c and pars0grm.c have lots of redundant decls 
317
317
# and unused/undefeind stuf, but are generated anyway 
318
318
plugin_innobase_libpars_la_CFLAGS=      ${AM_CFLAGS} ${NO_WERROR} \
 
319
                        -I$(top_builddir)/plugin/innobase/include \
319
320
                        -I$(top_srcdir)/plugin/innobase/include \
320
321
                        -DBUILD_DRIZZLE
321
 
plugin_innobase_libpars_la_SOURCES=     plugin/innobase/pars/pars0lex.c \
322
 
                        plugin/innobase/pars/pars0grm.c
 
322
 
 
323
plugin_innobase_libpars_la_SOURCES= \
 
324
                                    plugin/innobase/pars/pars0lex.c \
 
325
                                    plugin/innobase/pars/pars0grm.c
323
326
 
324
327
plugin_innobase_libinnobase_la_LIBADD=  plugin/innobase/libpars.la
325
328
 
326
329
plugin/innobase/pars/pars0grm.c: plugin/innobase/pars/pars0grm.y
327
 
        $(AM_V_GEN) $(YACC) -d plugin/innobase/pars/pars0grm.y -o plugin/innobase/pars/pars0grm.tab.c
 
330
        $(AM_V_GEN) $(YACC) -d $< -o plugin/innobase/pars/pars0grm.tab.c
 
331
        @mkdir -p plugin/innobase/include
328
332
        @mv plugin/innobase/pars/pars0grm.tab.h plugin/innobase/include/pars0grm.h
329
333
        @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
330
334
        @rm plugin/innobase/pars/pars0grm.tab.c