Commit e4c94f0f authored by MySQL Build Team's avatar MySQL Build Team

Ensure that all dtrace files are properly removed during make clean

parent e3550f51
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA # 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_CONFIGURE = mysql_version.h
HEADERS_GEN_MAKE = my_config.h HEADERS_GEN_MAKE = my_config.h
HEADERS_ABI = mysql.h mysql_com.h mysql_time.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 \ ...@@ -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 \ my_vle.h my_user.h my_atomic.h atomic/nolock.h \
atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h \ atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h \
atomic/solaris.h \ atomic/solaris.h \
atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \ atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h
probes_mysql.h probes_mysql_nodtrace.h
EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp probes_mysql.d.base EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp probes_mysql.d.base
...@@ -77,7 +76,7 @@ probes_mysql.d: ...@@ -77,7 +76,7 @@ probes_mysql.d:
DTRACEPROVIDER = probes_mysql.d DTRACEPROVIDER = probes_mysql.d
if HAVE_DTRACE if HAVE_DTRACE
BUILT_SOURCES += probes_mysql_dtrace.h 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 # 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 # then we copy the probes from the source location and use that
......
...@@ -132,6 +132,7 @@ libmysys_a_DEPENDENCIES += probes_mysql.o dtrace_files dtrace_providers ...@@ -132,6 +132,7 @@ libmysys_a_DEPENDENCIES += probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = mf_keycache.o DTRACEFILES = mf_keycache.o
DTRACEPROVIDER = probes_mysql.d DTRACEPROVIDER = probes_mysql.d
CLEANFILES += $(DTRACEPROVIDER) dtrace_sources
dtrace_files: dtrace_files:
echo $(DTRACEFILES) > $@ echo $(DTRACEFILES) > $@
......
...@@ -229,6 +229,7 @@ mysqld_LDADD += probes_all.o ...@@ -229,6 +229,7 @@ mysqld_LDADD += probes_all.o
mysqld_DEPENDENCIES += dtrace_files dtrace_providers probes_all.o mysqld_DEPENDENCIES += dtrace_files dtrace_providers probes_all.o
CLEANFILES += dtrace_files dtrace_providers probes_all.o CLEANFILES += dtrace_files dtrace_providers probes_all.o
DTRACEPROVIDER = probes_mysql.d DTRACEPROVIDER = probes_mysql.d
CLEANFILES += $(DTRACEPROVIDER)
dtrace_files: dtrace_files:
echo $(DTRACEFILES) > $@ echo $(DTRACEFILES) > $@
......
...@@ -48,6 +48,7 @@ libcsv_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers ...@@ -48,6 +48,7 @@ libcsv_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = libcsv_a-ha_tina.o DTRACEFILES = libcsv_a-ha_tina.o
DTRACEPROVIDER = probes_mysql.d DTRACEPROVIDER = probes_mysql.d
CLEANFILES += $(DTRACEPROVIDER) dtrace_sources
dtrace_files: dtrace_files:
echo $(DTRACEFILES) > $@ echo $(DTRACEFILES) > $@
......
...@@ -57,6 +57,7 @@ libheap_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers ...@@ -57,6 +57,7 @@ libheap_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = ha_heap.o DTRACEFILES = ha_heap.o
DTRACEPROVIDER = probes_mysql.d DTRACEPROVIDER = probes_mysql.d
CLEANFILES += $(DTRACEPROVIDER) dtrace_sources
dtrace_files: dtrace_files:
echo $(DTRACEFILES) > $@ echo $(DTRACEFILES) > $@
......
...@@ -156,6 +156,7 @@ libmyisam_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers ...@@ -156,6 +156,7 @@ libmyisam_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES += probes_mysql.o dtrace_files dtrace_providers CLEANFILES += probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = ha_myisam.o DTRACEFILES = ha_myisam.o
DTRACEPROVIDER = probes_mysql.d DTRACEPROVIDER = probes_mysql.d
CLEANFILES += $(DTRACEPROVIDER) dtrace_sources
dtrace_files: dtrace_files:
echo $(DTRACEFILES) > $@ echo $(DTRACEFILES) > $@
......
...@@ -46,6 +46,7 @@ libmyisammrg_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers ...@@ -46,6 +46,7 @@ libmyisammrg_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = ha_myisammrg.o DTRACEFILES = ha_myisammrg.o
DTRACEPROVIDER = probes_mysql.d DTRACEPROVIDER = probes_mysql.d
CLEANFILES += $(DTRACEPROVIDER) dtrace_sources
dtrace_files: dtrace_files:
echo $(DTRACEFILES) > $@ echo $(DTRACEFILES) > $@
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment