diff options
| author | MySQL Build Team <build@mysql.com> | 2009-11-13 21:32:29 +0100 |
|---|---|---|
| committer | MySQL Build Team <build@mysql.com> | 2009-11-13 21:32:29 +0100 |
| commit | f67ad80280407fb457dd1e5fc953b306e726ef4f (patch) | |
| tree | dffdc3495ccaab6d60a0ca4c8a8deee3d4d36922 /storage | |
| parent | 732597b54ee994f0f4b5cdf19c73f154ffbb6729 (diff) | |
| download | mariadb-git-f67ad80280407fb457dd1e5fc953b306e726ef4f.tar.gz | |
Solve a "make" rule issue in the context of dtarce and shared objects:
Replace a correct dependency in "storage/Makefile.am"
(which "make" cannot handle correctly, because it is to a "libtool"
convenience module) by a hack which it should.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/archive/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/archive/Makefile.am b/storage/archive/Makefile.am index 143d684025e..871acd673d1 100644 --- a/storage/archive/Makefile.am +++ b/storage/archive/Makefile.am @@ -80,6 +80,9 @@ ha_archive_la_DEPENDENCIES = probes_sh_mysql.o dtrace_shared_files dtrace_provid CLEANFILES = $(DTRACEPROVIDER) dtrace_files dtrace_providers dtrace_shared_files DTRACEFILES = libarchive_a-ha_archive.o DTRACESHAREDFILES = .libs/ha_archive_la-ha_archive.o +# Hack: We "depend" on ".libs/" but have no rule for it, +# but it is created as a byproduct of the ".lo" +DTRACESHAREDDEPEND = ha_archive_la-ha_archive.lo DTRACEPROVIDER = probes_mysql.d dtrace_files: @@ -93,7 +96,7 @@ probes_mysql.d: $(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d echo timestamp > dtrace_sources -probes_sh_mysql.o: $(DTRACEPROVIDER) $(DTRACESHAREDFILES) +probes_sh_mysql.o: $(DTRACEPROVIDER) $(DTRACESHAREDDEPEND) $(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACESHAREDFILES) -o $@ probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) |