diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-09 09:28:51 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-09 09:28:51 -0300 |
| commit | e1f748c0bd7e347dbefb831d64755d834845d15b (patch) | |
| tree | 8edee282fc8a225a291cd9be2e44e38709e31b1a /storage/innobase/Makefile.am | |
| parent | 80935b8659411177bc3fca4e0eb9f7747577eb1d (diff) | |
| parent | ed9ffc6b09a13197f3aadaf89c1dd3accee2dfd1 (diff) | |
| download | mariadb-git-e1f748c0bd7e347dbefb831d64755d834845d15b.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'storage/innobase/Makefile.am')
| -rw-r--r-- | storage/innobase/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/Makefile.am b/storage/innobase/Makefile.am index c15c46abaf0..7a6103d9e79 100644 --- a/storage/innobase/Makefile.am +++ b/storage/innobase/Makefile.am @@ -323,14 +323,14 @@ libinnobase_a_SOURCES= \ ut/ut0vec.c \ ut/ut0wqueue.c -libinnobase_a_CXXFLAGS= $(AM_CFLAGS) +libinnobase_a_CXXFLAGS= $(AM_CXXFLAGS) libinnobase_a_CFLAGS= $(AM_CFLAGS) EXTRA_LTLIBRARIES= ha_innodb.la pkgplugin_LTLIBRARIES= @plugin_innobase_shared_target@ ha_innodb_la_LDFLAGS= -module -rpath $(pkgplugindir) -ha_innodb_la_CXXFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) +ha_innodb_la_CXXFLAGS= $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS) ha_innodb_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) ha_innodb_la_SOURCES= $(libinnobase_a_SOURCES) |