diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2010-09-10 20:48:13 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2010-09-10 20:48:13 +0200 |
| commit | f19144c0940475730607d5627609687c8615f70d (patch) | |
| tree | d672649465fcb9292a9de5dafb534308e0adb2fb /include/Makefile.am | |
| parent | 7bd808548ee52e597cb444a2ef36c593d81fce0b (diff) | |
| parent | 9defb07e7dec05cbe899c8a63b7929f7232c37b6 (diff) | |
| download | mariadb-git-f19144c0940475730607d5627609687c8615f70d.tar.gz | |
Automerge (most) changes of the 5.5.6-rc release build to main 5.5.
This is not the final merge!
Diffstat (limited to 'include/Makefile.am')
| -rw-r--r-- | include/Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 5ddef2d381c..909f68936dc 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -32,8 +32,9 @@ pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ decimal.h errmsg.h my_global.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) \ - $(HEADERS_GEN_MAKE) probes_mysql.h probes_mysql_nodtrace.h + m_ctype.h my_attribute.h my_compiler.h \ + $(HEADERS_GEN_CONFIGURE) $(HEADERS_GEN_MAKE) \ + probes_mysql.h probes_mysql_nodtrace.h noinst_HEADERS = lf.h my_bit.h \ heap.h my_bitmap.h my_uctype.h password.h \ @@ -47,7 +48,7 @@ noinst_HEADERS = lf.h my_bit.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 \ - atomic/solaris.h mysql/innodb_priv.h my_compiler.h + atomic/solaris.h mysql/innodb_priv.h pkgpsiinclude_HEADERS = mysql/psi/psi.h mysql/psi/mysql_thread.h \ mysql/psi/mysql_file.h |