diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2009-12-16 16:20:08 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2009-12-16 16:20:08 +0100 |
| commit | 95199266d3b27b4599b136383f1eec309dcd196b (patch) | |
| tree | 44687e1e015ccde9dacb1bac98d643d5c786a7e3 /storage/archive | |
| parent | b3d99069077cd24e1cf4bb07857fdb12aee895a0 (diff) | |
| parent | cb2c2fd8df18ad10792a1ccd20ac63d526786c54 (diff) | |
| download | mariadb-git-95199266d3b27b4599b136383f1eec309dcd196b.tar.gz | |
Automerge the changes of version 5.5.0-m2.
Diffstat (limited to 'storage/archive')
| -rw-r--r-- | storage/archive/Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/storage/archive/Makefile.am b/storage/archive/Makefile.am index 143d684025e..bb88ff2e8d1 100644 --- a/storage/archive/Makefile.am +++ b/storage/archive/Makefile.am @@ -77,9 +77,12 @@ libarchive_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers ha_archive_la_LIBADD = probes_sh_mysql.o ha_archive_la_DEPENDENCIES = probes_sh_mysql.o dtrace_shared_files dtrace_providers -CLEANFILES = $(DTRACEPROVIDER) dtrace_files dtrace_providers dtrace_shared_files +CLEANFILES = $(DTRACEPROVIDER) dtrace_files dtrace_providers dtrace_shared_files dtrace_sources 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) |