← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/Makefile.am

  • Committer: Monty Taylor
  • Date: 2009-03-22 08:04:21 UTC
  • mto: (960.5.2 mordred)
  • mto: This revision was merged to the branch mainline in revision 961.
  • Revision ID: mordred@inaugust.com-20090322080421-xkfmhsstf51vvazm
Moved innodb handler code back to handler/ dir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/Makefile.am
15
15
 
16
16
 
17
17
AM_CPPFLAGS+=           -I$(top_srcdir)/storage/innobase/include
18
 
 
19
 
if BUILD_DRIZZLE
20
 
EXTRA_DEFS="-DBUILD_DRIZZLE"
21
 
DYNAMIC_PLUGIN="-DDRIZZLE_DYNAMIC_PLUGIN"
22
 
else
23
 
DYNAMIC_PLUGIN="-DMYSQL_DYNAMIC_PLUGIN"
24
 
endif
25
 
 
26
 
 
27
 
DEFS=                   @DEFS@ ${EXTRA_DEFS}
 
18
DEFS+=                  -DBUILD_DRIZZLE
28
19
 
29
20
 
30
21
noinst_HEADERS=         include/btr0btr.h include/btr0btr.ic            \
128
119
                        include/ut0vec.ic include/ut0list.h             \
129
120
                        include/ut0list.ic include/ut0wqueue.h          \
130
121
                        include/ha_prototypes.h                         \
131
 
                        drizzle/ha_innodb.h                             \
 
122
                        handler/ha_innodb.h                             \
132
123
                        include/handler0alter.h                         \
133
 
                        drizzle/handler0vars.h                          \
134
 
                        drizzle/i_s.h
 
124
                        handler/handler0vars.h                          \
 
125
                        handler/i_s.h
135
126
 
136
127
noinst_LTLIBRARIES=     libinnobase.la libpars.la
137
128
libinnobase_la_CFLAGS=  ${AM_CFLAGS} ${NO_SHADOW}
171
162
                        usr/usr0sess.c ut/ut0byte.c ut/ut0dbg.c         \
172
163
                        ut/ut0list.c ut/ut0mem.c ut/ut0rnd.c            \
173
164
                        ut/ut0ut.c ut/ut0vec.c ut/ut0wqueue.c           \
174
 
                        drizzle/ha_innodb.cc                            \
175
 
                        drizzle/handler0alter.cc                        \
176
 
                        drizzle/i_s.cc                                  \
177
 
                        drizzle/mysql_addons.cc
 
165
                        handler/ha_innodb.cc                            \
 
166
                        handler/handler0alter.cc                        \
 
167
                        handler/i_s.cc                                  \
 
168
                        handler/mysql_addons.cc
178
169
 
179
170
# lexyy.c has lots of redundant decls, but it's generated anyway 
180
171
libpars_la_CFLAGS=      ${AM_CFLAGS} ${NO_UNREACHED} \