diff options
| author | Vladislav Vaintroub <wlad@sol> | 2009-12-04 20:05:04 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@sol> | 2009-12-04 20:05:04 +0000 |
| commit | a426f50f5c77086f50d1853f48159c391bcd633f (patch) | |
| tree | 88f8eb36158b237cddb8fd5b1c7ee5283f8124f6 /include/Makefile.am | |
| parent | 131d1e6fdd88090dde6144be3c3d5150449efb95 (diff) | |
| parent | 560e76c567c3551f5a4320acfc954200e8330ad8 (diff) | |
| download | mariadb-git-a426f50f5c77086f50d1853f48159c391bcd633f.tar.gz | |
merge
Diffstat (limited to 'include/Makefile.am')
| -rw-r--r-- | include/Makefile.am | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 3d866961389..02d047f9c81 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2000-2006 MySQL AB +# Copyright (C) 2000-2006 MySQL AB, 2009 Sun Microsystems, Inc # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -24,6 +24,8 @@ pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ my_xml.h mysql_embed.h mysql/services.h \ mysql/service_my_snprintf.h mysql/service_thd_alloc.h \ my_pthread.h my_no_pthread.h \ + mysql/psi/psi.h mysql/psi/mysql_thread.h \ + mysql/psi/mysql_file.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 \ @@ -38,14 +40,16 @@ noinst_HEADERS = config-win.h config-netware.h lf.h my_bit.h \ my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \ thr_lock.h t_ctype.h violite.h my_md5.h base64.h \ my_handler.h my_time.h service_versions.h \ - my_rdtsc.h \ + my_rdtsc.h mysql/psi/psi_abi_v1.h mysql/psi/psi_abi_v2.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 \ atomic/solaris.h EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp probes_mysql.d.base \ - CMakeLists.txt + CMakeLists.txt \ + mysql/psi/psi_abi_v1.h.pp \ + mysql/psi/psi_abi_v2.h.pp # Remove built files and the symlinked directories CLEANFILES = $(BUILT_SOURCES) readline openssl probes_mysql.d probes_mysql_nodtrace.h |