← 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: 2009-01-28 19:37:25 UTC
  • mfrom: (779.3.11 devel)
  • Revision ID: brian@tangent.org-20090128193725-pz7g7dnp2dx0863e
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/Makefile.am
140
140
                        $(HANDLER_DIR)/i_s.h
141
141
 
142
142
noinst_LTLIBRARIES=     libinnobase.la libpars.la
 
143
libinnobase_la_CFLAGS=  ${AM_CFLAGS} ${NO_SHADOW}
143
144
libinnobase_la_SOURCES= btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c      \
144
145
                        btr/btr0sea.c buf/buf0buddy.c                   \
145
146
                        buf/buf0buf.c buf/buf0flu.c                     \
183
184
 
184
185
# lexyy.c has lots of redundant decls, but it's generated anyway 
185
186
libpars_la_CFLAGS=      ${AM_CFLAGS} \
186
 
                        ${NO_REDUNDANT_DECLS}
 
187
                        ${NO_REDUNDANT_DECLS} ${NO_SHADOW}
187
188
libpars_la_SOURCES=     pars/lexyy.c pars/pars0grm.c
188
189
 
189
190
libinnobase_la_LIBADD= libpars.la
194
195
 
195
196
ha_innodb_la_SOURCES=
196
197
ha_innodb_la_LDFLAGS=   -module -avoid-version -rpath $(pkgplugindir)
197
 
ha_innodb_la_CFLAGS=    ${AM_CFLAGS} ${DYNAMIC_PLUGIN}
198
 
ha_innodb_la_CXXFLAGS=  ${AM_CXXFLAGS} ${DYNAMIC_PLUGIN}
 
198
ha_innodb_la_CFLAGS=    ${AM_CFLAGS} ${DYNAMIC_PLUGIN} ${NO_SHADOW}
 
199
ha_innodb_la_CXXFLAGS=  ${AM_CXXFLAGS} ${DYNAMIC_PLUGIN} ${NO_SHADOW}
199
200
ha_innodb_la_LIBADD=    @plugin_innobase_shared_target@ \
200
201
                        libinnobase.la
201
202