diff options
| author | MySQL Build Team <build@mysql.com> | 2009-05-22 21:50:02 +0200 |
|---|---|---|
| committer | MySQL Build Team <build@mysql.com> | 2009-05-22 21:50:02 +0200 |
| commit | fd3986af200c48209abea3bf679843e4df978529 (patch) | |
| tree | 68053b19b175a7ad193e12317a25c2fd4843d776 /include/Makefile.am | |
| parent | 9c4407591c722b3281dbeff07c4877d153e4db6f (diff) | |
| parent | 907c71e792bc16ac52f2f48a33be225f4b13907f (diff) | |
| download | mariadb-git-fd3986af200c48209abea3bf679843e4df978529.tar.gz | |
Pull in the few changes from mysql-5.4.0-release; also a minor portability fix up from mysql-5.1
Diffstat (limited to 'include/Makefile.am')
| -rw-r--r-- | include/Makefile.am | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index dee012741a7..214ef8862e9 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -15,7 +15,7 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA -BUILT_SOURCES = $(HEADERS_GEN_MAKE) link_sources +BUILT_SOURCES = $(HEADERS_GEN_MAKE) link_sources probes_mysql_nodtrace.h HEADERS_GEN_CONFIGURE = mysql_version.h HEADERS_GEN_MAKE = my_config.h HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \ @@ -40,8 +40,7 @@ noinst_HEADERS = config-win.h config-netware.h my_bit.h \ my_vle.h my_user.h my_atomic.h atomic/nolock.h \ atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h \ atomic/solaris.h \ - atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \ - probes_mysql.h probes_mysql_nodtrace.h + atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp probes_mysql.d.base @@ -77,7 +76,7 @@ probes_mysql.d: DTRACEPROVIDER = probes_mysql.d if HAVE_DTRACE BUILT_SOURCES += probes_mysql_dtrace.h -CLEANFILES += probes_mysql_dtrace.h +CLEANFILES += $(DTRACEPROVIDER) # Fake for creating the probes file. If we are building a separate directory # then we copy the probes from the source location and use that |