← 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-11-17 20:32:01 UTC
  • mto: (1936.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1937.
  • Revision ID: mordred@inaugust.com-20101117203201-hc5bu3acmtsc0xqj
https://launchpad.net/bugs/676653
Add vpath info into pars0grm rules.

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
plugin_innobase_libpars_la_SOURCES=     ${top_builddir}/plugin/innobase/pars/pars0lex.c \
 
323
                        ${top_builddir}/plugin/innobase/pars/pars0grm.c
323
324
 
324
325
plugin_innobase_libinnobase_la_LIBADD=  plugin/innobase/libpars.la
325
326
 
326
327
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
 
328
        $(AM_V_GEN) $(YACC) -d $< -o plugin/innobase/pars/pars0grm.tab.c
 
329
        @mkdir -p plugin/innobase/include
328
330
        @mv plugin/innobase/pars/pars0grm.tab.h plugin/innobase/include/pars0grm.h
329
331
        @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
332
        @rm plugin/innobase/pars/pars0grm.tab.c