← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/Makefile.am

  • Committer: Jay Pipes
  • Date: 2009-02-04 15:44:25 UTC
  • mfrom: (829 drizzle)
  • mto: This revision was merged to the branch mainline in revision 830.
  • Revision ID: jpipes@serialcoder-20090204154425-th8xfk2ujz2y8xwg
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/Makefile.am
23
23
if BUILD_DRIZZLE
24
24
EXTRA_DEFS="-DBUILD_DRIZZLE"
25
25
DYNAMIC_PLUGIN="-DDRIZZLE_DYNAMIC_PLUGIN"
26
 
HANDLER_DIR=drizzle
27
26
else
28
27
DYNAMIC_PLUGIN="-DMYSQL_DYNAMIC_PLUGIN"
29
 
HANDLER_DIR=handler
30
28
endif
31
29
 
32
30
 
134
132
                        include/ut0vec.ic include/ut0list.h             \
135
133
                        include/ut0list.ic include/ut0wqueue.h          \
136
134
                        include/ha_prototypes.h                         \
137
 
                        $(HANDLER_DIR)/ha_innodb.h                      \
 
135
                        drizzle/ha_innodb.h                             \
138
136
                        include/handler0alter.h                         \
139
 
                        $(HANDLER_DIR)/handler0vars.h                   \
140
 
                        $(HANDLER_DIR)/i_s.h
 
137
                        drizzle/handler0vars.h                          \
 
138
                        drizzle/i_s.h
141
139
 
142
140
noinst_LTLIBRARIES=     libinnobase.la libpars.la
143
141
libinnobase_la_CFLAGS=  ${AM_CFLAGS} ${NO_SHADOW}
177
175
                        usr/usr0sess.c ut/ut0byte.c ut/ut0dbg.c         \
178
176
                        ut/ut0list.c ut/ut0mem.c ut/ut0rnd.c            \
179
177
                        ut/ut0ut.c ut/ut0vec.c ut/ut0wqueue.c           \
180
 
                        $(HANDLER_DIR)/ha_innodb.cc                     \
181
 
                        $(HANDLER_DIR)/handler0alter.cc                 \
182
 
                        $(HANDLER_DIR)/i_s.cc                           \
183
 
                        $(HANDLER_DIR)/mysql_addons.cc
 
178
                        drizzle/ha_innodb.cc                            \
 
179
                        drizzle/handler0alter.cc                        \
 
180
                        drizzle/i_s.cc                                  \
 
181
                        drizzle/mysql_addons.cc
184
182
 
185
183
# lexyy.c has lots of redundant decls, but it's generated anyway 
186
 
libpars_la_CFLAGS=      ${AM_CFLAGS} \
 
184
libpars_la_CFLAGS=      ${AM_CFLAGS} ${NO_UNREACHED} \
187
185
                        ${NO_REDUNDANT_DECLS} ${NO_SHADOW}
188
186
libpars_la_SOURCES=     pars/lexyy.c pars/pars0grm.c
189
187