mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 14:54:20 +01:00
Merge some more DTrace build fixes by MC Brown
This commit is contained in:
commit
fb96b19cf7
12 changed files with 12 additions and 12 deletions
|
@ -44,7 +44,7 @@ noinst_HEADERS = config-win.h config-netware.h my_bit.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
|
||||
EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp probes_mysql.d.base
|
||||
|
||||
# Remove built files and the symlinked directories
|
||||
CLEANFILES = $(BUILT_SOURCES) readline openssl
|
||||
|
@ -72,7 +72,7 @@ dist-hook:
|
|||
|
||||
probes_mysql.d:
|
||||
if ! test -f probes_mysql.d ; then \
|
||||
$(CP) -f $(top_srcdir)/include/probes_mysql.d probes_mysql.d; \
|
||||
$(CP) -f $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d; \
|
||||
fi
|
||||
|
||||
DTRACEPROVIDER = probes_mysql.d
|
||||
|
|
|
@ -139,7 +139,7 @@ dtrace_providers: probes_mysql.d
|
|||
echo $(DTRACEPROVIDER) > $@
|
||||
probes_mysql.d:
|
||||
-$(RM) -f probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d
|
||||
echo timestamp > dtrace_sources
|
||||
|
||||
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
|
||||
|
|
|
@ -236,7 +236,7 @@ dtrace_providers: probes_mysql.d
|
|||
echo $(DTRACEPROVIDER) > $@
|
||||
probes_mysql.d:
|
||||
-$(RM) -f probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d
|
||||
|
||||
DTRACEDIRS = . ../mysys $(patsubst %,$(top_builddir)/storage/%,@mysql_se_dirs@)
|
||||
|
||||
|
|
|
@ -80,7 +80,7 @@ dtrace_providers: probes_mysql.d
|
|||
echo $(DTRACEPROVIDER) > $@
|
||||
probes_mysql.d:
|
||||
-$(RM) -f probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d
|
||||
echo timestamp > dtrace_sources
|
||||
|
||||
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
|
||||
|
|
|
@ -62,7 +62,7 @@ dtrace_providers: probes_mysql.d
|
|||
echo $(DTRACEPROVIDER) > $@
|
||||
probes_mysql.d:
|
||||
-$(RM) -f probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d
|
||||
echo timestamp > dtrace_sources
|
||||
|
||||
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
|
||||
|
|
|
@ -55,7 +55,7 @@ dtrace_providers: probes_mysql.d
|
|||
echo $(DTRACEPROVIDER) > $@
|
||||
probes_mysql.d:
|
||||
-$(RM) -f probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d
|
||||
echo timestamp > dtrace_sources
|
||||
|
||||
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
|
||||
|
|
|
@ -63,7 +63,7 @@ dtrace_providers: probes_mysql.d
|
|||
echo $(DTRACEPROVIDER) > $@
|
||||
probes_mysql.d:
|
||||
-$(RM) -f probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d
|
||||
echo timestamp > dtrace_sources
|
||||
|
||||
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
|
||||
|
|
|
@ -62,7 +62,7 @@ dtrace_providers: probes_mysql.d
|
|||
echo $(DTRACEPROVIDER) > $@
|
||||
probes_mysql.d:
|
||||
-$(RM) -f probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d
|
||||
echo timestamp > dtrace_sources
|
||||
|
||||
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
|
||||
|
|
|
@ -64,7 +64,7 @@ dtrace_providers: probes_mysql.d
|
|||
echo $(DTRACEPROVIDER) > $@
|
||||
probes_mysql.d:
|
||||
-$(RM) -f probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d
|
||||
echo timestamp > dtrace_sources
|
||||
|
||||
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
|
||||
|
|
|
@ -163,7 +163,7 @@ dtrace_providers: probes_mysql.d
|
|||
echo $(DTRACEPROVIDER) > $@
|
||||
probes_mysql.d:
|
||||
-$(RM) -f probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d
|
||||
echo timestamp > dtrace_sources
|
||||
|
||||
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
|
||||
|
|
|
@ -53,7 +53,7 @@ dtrace_providers: probes_mysql.d
|
|||
echo $(DTRACEPROVIDER) > $@
|
||||
probes_mysql.d:
|
||||
-$(RM) -f probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
|
||||
$(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d
|
||||
echo timestamp > dtrace_sources
|
||||
|
||||
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
|
||||
|
|
Loading…
Add table
Reference in a new issue