bzr commit into mysql-5.5-next-mr-bugfixing branch (horst.hunger:2934) Bug#47146

[Horst.Hunger]

#At file:///home/horst/bzr/mr-bugf-47146/ based on revid:alik@stripped

 2934 Horst.Hunger	2009-12-16
      This is a the same patch that MC committed ago to bug#47146. I need it for a further push. This patch has been tested with cc and gcc on Solaris.

    modified:
      storage/example/Makefile.am
=== modified file 'storage/example/Makefile.am'
--- a/storage/example/Makefile.am	2009-11-12 12:13:43 +0000
+++ b/storage/example/Makefile.am	2009-12-16 12:06:23 +0000
@@ -52,9 +52,13 @@ EXTRA_DIST =		CMakeLists.txt plug.in
 if HAVE_DTRACE_DASH_G
 libexample_a_LIBADD = probes_mysql.o
 libexample_a_DEPENDENCIES = probes_mysql.o
+ha_example_la_LIBADD = probes_sh_mysql.o
+ha_example_la_DEPENDENCIES = probes_sh_mysql.o
 CLEANFILES =
 BUILT_SOURCES =
-DTRACEFILES = libexample_a-ha_example.o
+DTRACEFILES = libexample_a-ha_example.c
+DTRACESHAREDFILES = ha_example_la-ha_example.o
+DTRACESHAREDDEPS = ha_example_la-ha_example.lo
 DTRACEPROVIDER = probes_mysql.d
 
 dtrace_files:
@@ -68,6 +72,9 @@ probes_mysql.d:
 
 probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
 	$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
+probes_sh_mysql.o: $(DTRACEPROVIDER) $(DTRACESHAREDDEPS)
+	$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACESHAREDFILES) -o $@
+	$(CP) $(DTRACESHAREDFILES) .libs
 endif
 
 # Don't update the files from bitkeeper


Attachment: [text/bzr-bundle] bzr/[e-mail]