summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2010-10-25 15:21:16 +0200
committerSergei Golubchik <sergii@pisem.net>2010-10-25 15:21:16 +0200
commit04a4b4334650b2183d25a7b04c1e83c31bffb22d (patch)
tree587654c186615669df8d81b851db711bb8ac2f62 /include
parent37a78d6868d0e25d286299c91d5787fb6733844d (diff)
parent60c15066db4f59e0362420d46a1ca5b6fbb30e56 (diff)
downloadmariadb-git-04a4b4334650b2183d25a7b04c1e83c31bffb22d.tar.gz
merge with 5.1
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index fb5c746d129..d423e500aae 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -29,7 +29,8 @@ pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
decimal.h errmsg.h my_global.h my_valgrind.h my_net.h \
my_getopt.h sslopt-longopts.h my_dir.h \
sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
- m_ctype.h my_attribute.h $(HEADERS_GEN_CONFIGURE) \
+ m_ctype.h my_attribute.h my_compiler.h \
+ $(HEADERS_GEN_CONFIGURE) \
$(HEADERS_GEN_MAKE)
noinst_HEADERS = config-win.h config-netware.h lf.h my_bit.h \
@@ -43,7 +44,7 @@ noinst_HEADERS = config-win.h config-netware.h lf.h my_bit.h \
my_vle.h my_user.h my_atomic.h atomic/nolock.h \
atomic/rwlock.h atomic/x86-gcc.h atomic/generic-msvc.h \
atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \
- wqueue.h waiting_threads.h my_compiler.h
+ wqueue.h waiting_threads.h
EXTRA_DIST = mysql.h.pp mysql/plugin_auth.h.pp mysql/client_plugin.h.pp