← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/Makefile.am

  • Committer: Brian Aker
  • Date: 2008-10-28 16:09:18 UTC
  • mfrom: (520.4.17 devel)
  • Revision ID: brian@gir-3.local-20081028160918-y26t37hpdyo1mx9c
Merge from Monty. Updated UUID.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/Makefile.am
144
144
                        include/handler0alter.h                         \
145
145
                        $(HANDLER_DIR)/i_s.h
146
146
 
147
 
noinst_LTLIBRARIES=     libinnobase.la
 
147
noinst_LTLIBRARIES=     libinnobase.la libpars.la
148
148
libinnobase_la_SOURCES= btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c      \
149
149
                        btr/btr0sea.c buf/buf0buddy.c                   \
150
150
                        buf/buf0buf.c buf/buf0flu.c                     \
164
164
                        mtr/mtr0mtr.c os/os0file.c os/os0proc.c         \
165
165
                        os/os0sync.c os/os0thread.c page/page0cur.c     \
166
166
                        page/page0page.c page/page0zip.c                \
167
 
                        pars/lexyy.c pars/pars0grm.c                    \
168
167
                        pars/pars0opt.c pars/pars0pars.c                \
169
168
                        pars/pars0sym.c que/que0que.c read/read0read.c  \
170
169
                        rem/rem0cmp.c rem/rem0rec.c row/row0ext.c       \
187
186
                        $(HANDLER_DIR)/i_s.cc                           \
188
187
                        $(HANDLER_DIR)/mysql_addons.cc
189
188
 
190
 
libinnobase_la_CFLAGS=  $(AM_CFLAGS)  -Wno-unused-macros
 
189
# lexyy.c has lots of redundant decls, but it's generated anyway 
 
190
libpars_la_CFLAGS=      ${AM_CFLAGS} -Wno-redundant-decls -Wno-unused-macros
 
191
libpars_la_SOURCES=     pars/lexyy.c pars/pars0grm.c
 
192
 
 
193
libinnobase_la_CFLAGS=  $(AM_CFLAGS) -Wno-unused-macros
 
194
libinnobase_la_LIBADD= libpars.la
 
195
 
191
196
 
192
197
EXTRA_LTLIBRARIES=      ha_innodb.la
193
198
pkgplugin_LTLIBRARIES=  @plugin_innobase_shared_target@