List:Commits« Previous MessageNext Message »
From:Horst.Hunger Date:March 3 2010 9:13am
Subject:bzr commit into mysql-next-mr-bugfixing branch (horst.hunger:2985) Bug#47146
View as plain text  
#At file:///home/horst/bzr/next-mr-last-patch-47146/ based on revid:marc.alff@stripped

 2985 Horst.Hunger	2010-03-03
      Bug#47146 : Patch based on "mysql-next-mr-bugfixing". Includes MC's patch and the changes of the first review.

    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	2010-03-03 09:13:34 +0000
@@ -1,5 +1,5 @@
-# Copyright (C) 2005-2006 MySQL AB
-#
+# Copyright (C) 2005-2006 MySQL AB, 2009 Sun Microsystems, Inc.
+# All rights reserved.
 # 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.
@@ -50,11 +50,21 @@ 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 =
-DTRACEFILES = libexample_a-ha_example.o
+libexample_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
+# For example as shared library
+ha_example_la_LIBADD = probes_sh_mysql.o
+# Hack: We "depend" on ".libs/" but have no rule for it,
+# but it is created as a byproduct of the ".lo"
+DTRACESHAREDDEPS = ha_example_la-ha_example.lo
+ha_example_la_DEPENDENCIES = probes_sh_mysql.o $(DTRACESHAREDDEPS) dtrace_providers
+
+CLEANFILES = $(DTRACEPROVIDER) dtrace_files dtrace_providers $(DTRACESHAREDFILES)
+DTRACEFILES = libexample_a-ha_example.c
+DTRACESHAREDFILES = ha_example_la-ha_example.o
 DTRACEPROVIDER = probes_mysql.d
 
 dtrace_files:
@@ -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) $(DTRACESHAREDDEPS)
+        $(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACESHAREDFILES) -o $@
+        $(CP) $(DTRACESHAREDFILES) .libs
 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/horst.hunger@sun.com-20100303091334-dzo0uxvtpmcnbcf1.bundle
Thread
bzr commit into mysql-next-mr-bugfixing branch (horst.hunger:2985) Bug#47146Horst.Hunger3 Mar
  • Re: bzr commit into mysql-next-mr-bugfixing branch (horst.hunger:2985)Bug#47146Olav Sandstaa3 Mar
    • Re: bzr commit into mysql-next-mr-bugfixing branch (horst.hunger:2985)Bug#47146Horst Hunger3 Mar
      • Re: bzr commit into mysql-next-mr-bugfixing branch (horst.hunger:2985)Bug#47146Olav Sandstaa3 Mar
  • Re: bzr commit into mysql-next-mr-bugfixing branch (horst.hunger:2985)Bug#47146Olav Sandstaa3 Mar
    • Re: bzr commit into mysql-next-mr-bugfixing branch (horst.hunger:2985)Bug#47146Olav Sandstaa4 Mar
      • Re: bzr commit into mysql-next-mr-bugfixing branch (horst.hunger:2985)Bug#47146Olav Sandstaa4 Mar