#At file:///net/helheim/store/bteam/bzr/mysql-5.4.0-release/
2848 MySQL Build Team 2009-04-05
Ensure that all dtrace files are properly removed during make clean
modified:
include/Makefile.am
mysys/Makefile.am
sql/Makefile.am
storage/csv/Makefile.am
storage/heap/Makefile.am
storage/myisam/Makefile.am
storage/myisammrg/Makefile.am
=== modified file 'include/Makefile.am'
--- a/include/Makefile.am 2009-04-03 13:52:59 +0000
+++ b/include/Makefile.am 2009-04-05 20:18:21 +0000
@@ -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-net
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
=== modified file 'mysys/Makefile.am'
--- a/mysys/Makefile.am 2009-03-18 10:04:15 +0000
+++ b/mysys/Makefile.am 2009-04-05 20:18:21 +0000
@@ -132,6 +132,7 @@ libmysys_a_DEPENDENCIES += probes_mysql.
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = mf_keycache.o
DTRACEPROVIDER = probes_mysql.d
+CLEANFILES += $(DTRACEPROVIDER) dtrace_sources
dtrace_files:
echo $(DTRACEFILES) > $@
=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am 2009-03-18 10:04:15 +0000
+++ b/sql/Makefile.am 2009-04-05 20:18:21 +0000
@@ -229,6 +229,7 @@ mysqld_LDADD += probes_all.o
mysqld_DEPENDENCIES += dtrace_files dtrace_providers probes_all.o
CLEANFILES += dtrace_files dtrace_providers probes_all.o
DTRACEPROVIDER = probes_mysql.d
+CLEANFILES += $(DTRACEPROVIDER)
dtrace_files:
echo $(DTRACEFILES) > $@
=== modified file 'storage/csv/Makefile.am'
--- a/storage/csv/Makefile.am 2009-03-18 10:04:15 +0000
+++ b/storage/csv/Makefile.am 2009-04-05 20:18:21 +0000
@@ -48,6 +48,7 @@ libcsv_a_DEPENDENCIES = probes_mysql.o d
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = libcsv_a-ha_tina.o
DTRACEPROVIDER = probes_mysql.d
+CLEANFILES += $(DTRACEPROVIDER) dtrace_sources
dtrace_files:
echo $(DTRACEFILES) > $@
=== modified file 'storage/heap/Makefile.am'
--- a/storage/heap/Makefile.am 2009-03-18 10:04:15 +0000
+++ b/storage/heap/Makefile.am 2009-04-05 20:18:21 +0000
@@ -57,6 +57,7 @@ libheap_a_DEPENDENCIES = probes_mysql.o
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = ha_heap.o
DTRACEPROVIDER = probes_mysql.d
+CLEANFILES += $(DTRACEPROVIDER) dtrace_sources
dtrace_files:
echo $(DTRACEFILES) > $@
=== modified file 'storage/myisam/Makefile.am'
--- a/storage/myisam/Makefile.am 2009-03-18 10:04:15 +0000
+++ b/storage/myisam/Makefile.am 2009-04-05 20:18:21 +0000
@@ -156,6 +156,7 @@ libmyisam_a_DEPENDENCIES = probes_mysql.
CLEANFILES += probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = ha_myisam.o
DTRACEPROVIDER = probes_mysql.d
+CLEANFILES += $(DTRACEPROVIDER) dtrace_sources
dtrace_files:
echo $(DTRACEFILES) > $@
=== modified file 'storage/myisammrg/Makefile.am'
--- a/storage/myisammrg/Makefile.am 2009-03-18 10:04:15 +0000
+++ b/storage/myisammrg/Makefile.am 2009-04-05 20:18:21 +0000
@@ -46,6 +46,7 @@ libmyisammrg_a_DEPENDENCIES = probes_mys
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = ha_myisammrg.o
DTRACEPROVIDER = probes_mysql.d
+CLEANFILES += $(DTRACEPROVIDER) dtrace_sources
dtrace_files:
echo $(DTRACEFILES) > $@
| Thread |
|---|
| • bzr commit into mysql-5.1 branch (build:2848) | MySQL Build Team | 5 Apr |
