mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

A workaround to handle the problem with that

Browse source 
abs_top_srcdir doesn't work on some automake
platforms.

Done by copying the .d files to the build
directories.
This commit is contained in:
Mikael Ronstrom 2009-02-20 23:11:09 +01:00
parent 5767c1f826
commit 391fff8f73
12 changed files with 90 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/Makefile.am
View file

@ -15,7 +15,7 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA
BUILT_SOURCES = $(HEADERS_GEN_MAKE) link_sources
BUILT_SOURCES = $(HEADERS_GEN_MAKE) link_sources dtrace_sources
HEADERS_GEN_CONFIGURE = mysql_version.h
HEADERS_GEN_MAKE = my_config.h
HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
@ -69,11 +69,21 @@ my_config.h: config.h
dist-hook:
$(RM) -f $(distdir)/mysql_version.h $(distdir)/my_config.h
DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
DTRACEPROVIDER = probes_mysql.d
if HAVE_DTRACE
BUILT_SOURCES += probes_mysql_dtrace.h
CLEANFILES += probes_mysql_dtrace.h
# Fake for creating the probes file. If we are building a separate directory
# then we copy the probes from the source location and use that
# If we are building in the same directory as the source, we do not copy
dtrace_sources:
if ! test -f probes_mysql.d ; then \
$(CP) -f $(top_srcdir)/include/probes_mysql.d probes_mysql.d; \
fi
echo timestamp > dtrace_sources
probes_mysql_dtrace.h: $(DTRACEPROVIDER)
$(DTRACE) $(DTRACEFLAGS) -h -s $(DTRACEPROVIDER) -o $@
endif

0
sql/probes_mysql.d → include/probes_mysql.d
View file

13
mysys/Makefile.am
View file

@ -131,13 +131,18 @@ libmysys_a_LIBADD += probes_mysql.o
libmysys_a_DEPENDENCIES += probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = mf_keycache.o
DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
DTRACEPROVIDER = probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@
dtrace_providers:
echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
dtrace_providers: dtrace_sources
echo $(SQL_DTRACEPROVIDER) > $@
dtrace_sources:
-$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) dtrace_sources
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
endif

9
sql/Makefile.am
View file

@ -212,16 +212,19 @@ libndb_la_DEPENDENCIES = dtrace_files dtrace_providers probes_libndb.o
mysqld_LDADD += probes_all.o
mysqld_DEPENDENCIES += dtrace_files dtrace_providers probes_all.o
CLEANFILES += dtrace_files dtrace_providers probes_all.o
DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
DTRACEPROVIDER = ../include/probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@
dtrace_providers:
dtrace_providers: dtrace_sources
echo $(DTRACEPROVIDER) > $@
dtrace_sources:
-$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d 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) dtrace_sources
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 $@

11
storage/archive/Makefile.am
View file

@ -72,13 +72,18 @@ libarchive_a_LIBADD = probes_mysql.o
libarchive_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = libarchive_a-ha_archive.o
DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
DTRACEPROVIDER = probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@
dtrace_providers:
dtrace_providers: dtrace_sources
echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
dtrace_sources:
-$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) dtrace_sources
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
endif

11
storage/blackhole/Makefile.am
View file

@ -54,13 +54,18 @@ libblackhole_a_LIBADD = probes_mysql.o
libblackhole_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = libblackhole_a-ha_blackhole.o
DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
DTRACEPROVIDER = probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@
dtrace_providers:
dtrace_providers: dtrace_sources
echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
dtrace_sources:
-$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) dtrace_sources
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
endif

10
storage/csv/Makefile.am
View file

@ -47,13 +47,17 @@ libcsv_a_LIBADD = probes_mysql.o
libcsv_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = libcsv_a-ha_tina.o
DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
DTRACEPROVIDER = probes_mysql.d
dtrace_sources:
-$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
echo timestamp > dtrace_sources
dtrace_files:
echo $(DTRACEFILES) > $@
dtrace_providers:
dtrace_providers: dtrace_sources
echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) dtrace_sources
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
endif

11
storage/example/Makefile.am
View file

@ -55,13 +55,18 @@ libexample_a_DEPENDENCIES = probes_mysql.o
CLEANFILES =
BUILT_SOURCES =
DTRACEFILES = libexample_a-ha_example.o
DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
DTRACEPROVIDER = probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@
dtrace_providers:
dtrace_providers: dtrace_sources
echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
dtrace_sources:
-$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) dtrace_sources
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
endif

11
storage/federated/Makefile.am
View file

@ -54,13 +54,18 @@ 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
DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
DTRACEPROVIDER = probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@
dtrace_providers:
dtrace_providers: dtrace_sources
echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
dtrace_sources:
-$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) dtrace_sources
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
endif

11
storage/heap/Makefile.am
View file

@ -56,13 +56,18 @@ libheap_a_LIBADD = probes_mysql.o
libheap_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = ha_heap.o
DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
DTRACEPROVIDER = probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@
dtrace_providers:
dtrace_providers: dtrace_sources
echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
dtrace_sources:
-$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) dtrace_sources
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
endif

11
storage/myisam/Makefile.am
View file

@ -155,13 +155,18 @@ libmyisam_a_LIBADD = probes_mysql.o
libmyisam_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES += probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = ha_myisam.o
DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
DTRACEPROVIDER = probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@
dtrace_providers:
dtrace_providers: dtrace_sources
echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
dtrace_sources:
-$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) dtrace_sources
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
endif

11
storage/myisammrg/Makefile.am
View file

@ -45,13 +45,18 @@ libmyisammrg_a_LIBADD = probes_mysql.o
libmyisammrg_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
CLEANFILES = probes_mysql.o dtrace_files dtrace_providers
DTRACEFILES = ha_myisammrg.o
DTRACEPROVIDER = $(top_srcdir)/sql/probes_mysql.d
DTRACEPROVIDER = probes_mysql.d
dtrace_files:
echo $(DTRACEFILES) > $@
dtrace_providers:
dtrace_providers: dtrace_sources
echo $(DTRACEPROVIDER) > $@
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
dtrace_sources:
-$(RM) -f probes_mysql.d
$(CP) $(top_srcdir)/include/probes_mysql.d probes_mysql.d
echo timestamp > dtrace_sources
probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES) dtrace_sources
$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACEFILES) -o $@
endif