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

[Horst.Hunger]

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

 2915 Horst.Hunger	2009-10-26
      Patch for bug#47146: Patch after first review. Taken from the Makefile.am for archive and changed for example.

    modified:
      storage/example/Makefile.am
=== modified file 'storage/example/Makefile.am'
--- a/storage/example/Makefile.am	2009-03-18 10:04:15 +0000
+++ b/storage/example/Makefile.am	2009-10-26 13:52:10 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2005-2006 MySQL AB
+# Copyright (C) 2009 SUN Microsystems
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -50,15 +51,24 @@ libexample_a_SOURCES=	ha_example.cc
 EXTRA_DIST =		CMakeLists.txt plug.in
 
 if HAVE_DTRACE_DASH_G
+# The object for static and dynamic linking of example differ
+# For static linkage of example to mysqld
+# That's actually not needed as example is only dynamic loadable, but for completion
 libexample_a_LIBADD = probes_mysql.o
-libexample_a_DEPENDENCIES = probes_mysql.o
-CLEANFILES =
-BUILT_SOURCES =
+libexample_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
+# For example as shared library
+ha_example_la_LIBADD = probes_sh_mysql.o
+ha_example_la_DEPENDENCIES = probes_sh_mysql.o dtrace_shared_files dtrace_providers
+
+CLEANFILES = $(DTRACEPROVIDER) dtrace_files dtrace_providers dtrace_shared_files
 DTRACEFILES = libexample_a-ha_example.o
+DTRACESHAREDFILES = .libs/ha_example_la-ha_example.o
 DTRACEPROVIDER = probes_mysql.d
 
 dtrace_files:
 	echo $(DTRACEFILES) > $@
+dtrace_shared_files:
+	echo $(DTRACESHAREDFILES) > $@
 dtrace_providers: probes_mysql.d
 	echo $(DTRACEPROVIDER) > $@
 probes_mysql.d:
@@ -66,8 +76,12 @@ probes_mysql.d:
 	$(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d
 	echo timestamp > dtrace_sources
 
+probes_sh_mysql.o: $(DTRACEPROVIDER) $(DTRACESHAREDFILES)
+	$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACESHAREDFILES) -o $@
+
 probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
 	$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
+
 endif
 
 # Don't update the files from bitkeeper


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