diff options
| author | Horst.Hunger <horst.hunger@sun.com> | 2010-05-05 09:35:38 +0200 |
|---|---|---|
| committer | Horst.Hunger <horst.hunger@sun.com> | 2010-05-05 09:35:38 +0200 |
| commit | 9eae31abc471803c2e25adc8b426a4a65a3feeb5 (patch) | |
| tree | 2a0aea8e955a862ded0bf5f0ca80035e19ccafe4 /storage | |
| parent | 8372ce979dd724b3699e27817b6c039525c3876f (diff) | |
| download | mariadb-git-9eae31abc471803c2e25adc8b426a4a65a3feeb5.tar.gz | |
Patch for 47759 to trunk-bugfixing.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/federated/Makefile.am | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/storage/federated/Makefile.am b/storage/federated/Makefile.am index 58e08b1462a..aa275b909ea 100644 --- a/storage/federated/Makefile.am +++ b/storage/federated/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 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. @@ -23,7 +23,8 @@ pkgplugindir = $(pkglibdir)/plugin INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ -I$(top_srcdir)/regex \ -I$(top_srcdir)/sql \ - -I$(srcdir) + -I$(srcdir) + WRAPLIBS= LDADD = @@ -50,11 +51,22 @@ libfederated_a_SOURCES= ha_federated.cc EXTRA_DIST = CMakeLists.txt plug.in if HAVE_DTRACE_DASH_G +# The object for static and dynamic linking of federated differ +# For static linkage of federated to mysqld + libfederated_a_LIBADD = probes_mysql.o libfederated_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers -CLEANFILES = probes_mysql.o dtrace_files dtrace_providers -DTRACEFILES = libfederated_a-ha_federated.o +# For federated as shared library +ha_federated_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_federated_la-ha_federated.lo +DTRACESHAREDFILES = ha_federated_la-ha_federated.o DTRACEPROVIDER = probes_mysql.d +ha_federated_la_DEPENDENCIES = probes_sh_mysql.o $(DTRACESHAREDDEPS) dtrace_providers + +CLEANFILES = $(DTRACEPROVIDER) dtrace_files dtrace_providers $(DTRACESHAREDFILES) +DTRACEFILES = libfederated_a-ha_federated.o dtrace_files: echo $(DTRACEFILES) > $@ @@ -65,8 +77,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 |