diff options
| -rw-r--r-- | include/Makefile.am | 7 | ||||
| -rw-r--r-- | mysys/Makefile.am | 1 | ||||
| -rw-r--r-- | sql/Makefile.am | 1 | ||||
| -rw-r--r-- | storage/csv/Makefile.am | 1 | ||||
| -rw-r--r-- | storage/heap/Makefile.am | 1 | ||||
| -rw-r--r-- | storage/myisam/Makefile.am | 1 | ||||
| -rw-r--r-- | storage/myisammrg/Makefile.am | 1 |
7 files changed, 9 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 diff --git a/mysys/Makefile.am b/mysys/Makefile.am index f70c6199f5b..da840f123d9 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -132,6 +132,7 @@ libmysys_a_DEPENDENCIES += probes_mysql.o dtrace_files dtrace_providers CLEANFILES = probes_mysql.o dtrace_files dtrace_providers DTRACEFILES = mf_keycache.o DTRACEPROVIDER = probes_mysql.d +CLEANFILES += $(DTRACEPROVIDER) dtrace_sources dtrace_files: echo $(DTRACEFILES) > $@ diff --git a/sql/Makefile.am b/sql/Makefile.am index 5a6ec20eed0..e44db69e713 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -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) > $@ diff --git a/storage/csv/Makefile.am b/storage/csv/Makefile.am index 06db0ff7642..96fc26bed07 100644 --- a/storage/csv/Makefile.am +++ b/storage/csv/Makefile.am @@ -48,6 +48,7 @@ libcsv_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers 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) > $@ diff --git a/storage/heap/Makefile.am b/storage/heap/Makefile.am index 67bf37f239e..c30fd1590f0 100644 --- a/storage/heap/Makefile.am +++ b/storage/heap/Makefile.am @@ -57,6 +57,7 @@ libheap_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers CLEANFILES = probes_mysql.o dtrace_files dtrace_providers DTRACEFILES = ha_heap.o DTRACEPROVIDER = probes_mysql.d +CLEANFILES += $(DTRACEPROVIDER) dtrace_sources dtrace_files: echo $(DTRACEFILES) > $@ diff --git a/storage/myisam/Makefile.am b/storage/myisam/Makefile.am index 74e54b92e66..6dd0d2bcbdb 100644 --- a/storage/myisam/Makefile.am +++ b/storage/myisam/Makefile.am @@ -156,6 +156,7 @@ libmyisam_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers CLEANFILES += probes_mysql.o dtrace_files dtrace_providers DTRACEFILES = ha_myisam.o DTRACEPROVIDER = probes_mysql.d +CLEANFILES += $(DTRACEPROVIDER) dtrace_sources dtrace_files: echo $(DTRACEFILES) > $@ diff --git a/storage/myisammrg/Makefile.am b/storage/myisammrg/Makefile.am index 69857c471e9..b7eab6bfdb7 100644 --- a/storage/myisammrg/Makefile.am +++ b/storage/myisammrg/Makefile.am @@ -46,6 +46,7 @@ libmyisammrg_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers CLEANFILES = probes_mysql.o dtrace_files dtrace_providers DTRACEFILES = ha_myisammrg.o DTRACEPROVIDER = probes_mysql.d +CLEANFILES += $(DTRACEPROVIDER) dtrace_sources dtrace_files: echo $(DTRACEFILES) > $@ |