bzr commit into mysql-6.0-codebase-bugfixing branch (pstoev:3703) Bug#47146

[Philip Stoev]

#At file:///build/bzr/6.0-codebase-bugfixing/ based on revid:jon.hauglid@stripped

 3703 Philip Stoev	2009-11-11 [merge]
      merge: revert patch for bug #47146 because it breaks Solaris builds

    modified:
      storage/example/Makefile.am
=== modified file 'storage/example/Makefile.am'
--- a/storage/example/Makefile.am	2009-11-09 10:12:52 +0000
+++ b/storage/example/Makefile.am	2009-11-11 10:03:16 +0000
@@ -1,5 +1,5 @@
-# Copyright (C) 2005-2006 MySQL AB, 2009 Sun Microsystems, Inc.
-# All rights reserved. 
+# Copyright (C) 2005-2006 MySQL AB
+#
 # 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
 # the Free Software Foundation; version 2 of the License.
@@ -46,18 +46,11 @@ 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 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 $(DTRACESHAREDFILES) dtrace_providers
-
-CLEANFILES = $(DTRACEPROVIDER) dtrace_files dtrace_providers $(DTRACESHAREDFILES)
+libexample_a_DEPENDENCIES = probes_mysql.o
+CLEANFILES =
+BUILT_SOURCES =
 DTRACEFILES = libexample_a-ha_example.o
-DTRACESHAREDFILES = .libs/ha_example_la-ha_example.o
 DTRACEPROVIDER = probes_mysql.d
 
 dtrace_files:
@@ -69,10 +62,6 @@ 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


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