~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/Makefile.am

  • Committer: Brian Aker
  • Date: 2008-07-13 22:45:08 UTC
  • Revision ID: brian@tangent.org-20080713224508-hb20z4okblotb39a
longlong replacement

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
MYSQLBASEdir=           $(prefix)
21
21
MYSQLLIBdir=            $(pkglibdir)
22
22
pkgplugindir =          $(pkglibdir)/plugin
23
 
AM_CPPFLAGS =           ${GLOBAL_CPPFLAGS} \
24
 
                        -I$(top_srcdir)/storage/innobase/include
 
23
AM_CPPFLAGS =              -I$(top_srcdir)/include -I$(top_builddir)/include \
 
24
                        -I$(top_srcdir)/regex \
 
25
                        -I$(top_srcdir)/storage/innobase/include \
 
26
                        -I$(top_srcdir)/server \
 
27
                        -I$(srcdir)
25
28
 
26
29
DEFS =                  @DEFS@
27
30
 
152
155
                        ut/ut0ut.c ut/ut0vec.c ut/ut0wqueue.c           \
153
156
                        handler/ha_innodb.cc
154
157
 
 
158
libinnobase_a_CXXFLAGS= $(AM_CFLAGS)
 
159
libinnobase_a_CFLAGS  = $(AM_CFLAGS)
 
160
 
155
161
EXTRA_LTLIBRARIES =     ha_innodb.la
156
162
pkglib_LTLIBRARIES =    @plugin_innobase_shared_target@
157
163
 
158
164
ha_innodb_la_LDFLAGS =  -module -rpath $(pkgplugindir)
159
 
ha_innodb_la_CXXFLAGS=  $(AM_CXXFLAGS) -DDRIZZLE_DYNAMIC_PLUGIN
160
 
ha_innodb_la_CFLAGS  =  $(AM_CFLAGS) -DDRIZZLE_DYNAMIC_PLUGIN
 
165
ha_innodb_la_CXXFLAGS=  $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 
166
ha_innodb_la_CFLAGS  =  $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
161
167
ha_innodb_la_SOURCES =  $(libinnobase_a_SOURCES)
162
168
 
163
169
EXTRA_DIST =            plug.in \