From 1ad9b0fa4fb2d0b46d0064ed667433335451f900 Mon Sep 17 00:00:00 2001 From: Mikael Ronstrom Date: Fri, 6 Mar 2009 13:22:25 +0100 Subject: [PATCH] Ensured that we apply DTrace script on both object files potentially produced by libtool --- sql/Makefile.am | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sql/Makefile.am b/sql/Makefile.am index cee2c37fd2e..cca02ecc47a 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -248,7 +248,13 @@ probes_all.o: probes_mysql.d $(DTRACEFILES_DEPEND) # Can't depend directly on .libs/*.o, because there is no generated rule for # that in the Makefile; it is a byproduct of *.lo probes_libndb.o: probes_mysql.d libndb_la-ha_ndbcluster.lo - $(DTRACE) $(DTRACEFLAGS) -G -s probes_mysql.d .libs/libndb_la-ha_ndbcluster.o -o $@ + if test -f .libs/libndb_la-ha_ndbcluster.o ; then + $(DTRACE) $(DTRACEFLAGS) -G -s probes_mysql.d .libs/libndb_la-ha_ndbcluster.o -o $@ + endif + if test -f libndb_la-ha_ndbcluster.o ; then + $(DTRACE) $(DTRACEFLAGS) -G -s probes_mysql.d libndb_la-ha_ndbcluster.o -o $@ + endif + endif # Don't update the files from bitkeeper