summaryrefslogtreecommitdiff
path: root/sql/Makefile.am
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael@mysql.com>2009-02-26 17:24:17 +0100
committerMikael Ronstrom <mikael@mysql.com>2009-02-26 17:24:17 +0100
commitf565f58bfed55bc1104b92b96d7d32b3fb5aa1f2 (patch)
tree2d7f20f9adf77e1e52db8e8ac40ca8131eab8cd6 /sql/Makefile.am
parentc73f724e59fbc875b670dddee510281056c16337 (diff)
downloadmariadb-git-f565f58bfed55bc1104b92b96d7d32b3fb5aa1f2.tar.gz
Separated what to use as dependency and what to use as list of object files
Diffstat (limited to 'sql/Makefile.am')
-rw-r--r--sql/Makefile.am19
1 files changed, 18 insertions, 1 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am
index cbeaaabfda6..4676573840f 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -45,6 +45,23 @@ DTRACEFILES = filesort.o \
sql_select.o \
sql_update.o
+DTRACEFILES_DEPEND = filesort.o \
+ .libs/libndb_la-ha_ndbcluster.lo \
+ handler.o \
+ mysqld.o \
+ net_serv.o \
+ scheduler.o \
+ sp_head.o \
+ sql_cache.o \
+ sql_connect.o \
+ sql_cursor.o \
+ sql_delete.o \
+ sql_insert.o \
+ sql_parse.o \
+ sql_prepare.o \
+ sql_select.o \
+ sql_update.o
+
noinst_LTLIBRARIES= libndb.la \
udf_example.la
@@ -223,7 +240,7 @@ probes_mysql.d:
DTRACEDIRS = . ../mysys $(patsubst %,$(top_builddir)/storage/%,@mysql_se_dirs@)
-probes_all.o: probes_mysql.d $(DTRACEFILES)
+probes_all.o: probes_mysql.d $(DTRACEFILES_DEPEND)
providers=`(for i in $(DTRACEDIRS); do cat $$i/dtrace_providers 2>/dev/null; done) | tr " " "\n" | sort | uniq | sed -e '/^$$/d' -e 's/^/-s /'`; \
objects=`for i in $(DTRACEDIRS); do f=\`cat $$i/dtrace_files 2>/dev/null\`; for j in $$f; do test -f $$i/$$j && echo "$$i/$$j "; done; done`; \
$(DTRACE) $(DTRACEFLAGS) -G $$providers $$objects -o $@