mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge some more DTrace build fixes by MC Brown

Browse source
This commit is contained in:
Mikael Ronstrom 2009-03-27 15:31:08 +01:00
commit fb96b19cf7
12 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/Makefile.am
View file

@ -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 \ atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \
probes_mysql.h probes_mysql_nodtrace.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 # Remove built files and the symlinked directories
CLEANFILES = $(BUILT_SOURCES) readline openssl CLEANFILES = $(BUILT_SOURCES) readline openssl
@ -72,7 +72,7 @@ dist-hook:
probes_mysql.d: probes_mysql.d:
if ! test -f probes_mysql.d ; then \ 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 fi
DTRACEPROVIDER = probes_mysql.d DTRACEPROVIDER = probes_mysql.d

0
include/probes_mysql.d → include/probes_mysql.d.base
View file

2
mysys/Makefile.am
View file

@ -139,7 +139,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: probes_mysql.d:
-$(RM) -f 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 echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)

2
sql/Makefile.am
View file

@ -236,7 +236,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: probes_mysql.d:
-$(RM) -f 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@) DTRACEDIRS = . ../mysys $(patsubst %,$(top_builddir)/storage/%,@mysql_se_dirs@)

2
storage/archive/Makefile.am
View file

@ -80,7 +80,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: probes_mysql.d:
-$(RM) -f 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 echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)

2
storage/blackhole/Makefile.am
View file

@ -62,7 +62,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: probes_mysql.d:
-$(RM) -f 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 echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)

2
storage/csv/Makefile.am
View file

@ -55,7 +55,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: probes_mysql.d:
-$(RM) -f 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 echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)

2
storage/example/Makefile.am
View file

@ -63,7 +63,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: probes_mysql.d:
-$(RM) -f 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 echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)

2
storage/federated/Makefile.am
View file

@ -62,7 +62,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: probes_mysql.d:
-$(RM) -f 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 echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)

2
storage/heap/Makefile.am
View file

@ -64,7 +64,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: probes_mysql.d:
-$(RM) -f 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 echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)

2
storage/myisam/Makefile.am
View file

@ -163,7 +163,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: probes_mysql.d:
-$(RM) -f 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 echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)

2
storage/myisammrg/Makefile.am
View file

@ -53,7 +53,7 @@ dtrace_providers: probes_mysql.d
echo $(DTRACEPROVIDER) > $@ echo $(DTRACEPROVIDER) > $@
probes_mysql.d: probes_mysql.d:
-$(RM) -f 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 echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)