summaryrefslogtreecommitdiff
path: root/libmysql_r
diff options
context:
space:
mode:
authorunknown <kent@mysql.com/kent-amd64.(none)>2006-11-27 18:29:50 +0100
committerunknown <kent@mysql.com/kent-amd64.(none)>2006-11-27 18:29:50 +0100
commit8d6f67f3269917f0353c94e387a04e629445f0ce (patch)
tree6e69443c2ba64be6a55243ae050033ea5a4669c1 /libmysql_r
parent6de6b97eeed6db587d1c856178262d7ead396a9b (diff)
downloadmariadb-git-8d6f67f3269917f0353c94e387a04e629445f0ce.tar.gz
gen_rec.awk:
Fix undefined behaviour. Many files: Reenabled build outside ource tree bdb/dist/gen_rec.awk: Fix undefined behaviour. acinclude.m4: Reenabled build outside ource tree configure.in: Reenabled build outside ource tree libmysql_r/Makefile.am: Reenabled build outside ource tree libmysqld/Makefile.am: Reenabled build outside ource tree ndb/config/common.mk.am: Reenabled build outside ource tree ndb/config/type_kernel.mk.am: Reenabled build outside ource tree ndb/config/type_ndbapi.mk.am: Reenabled build outside ource tree ndb/config/type_ndbapitest.mk.am: Reenabled build outside ource tree ndb/config/type_ndbapitools.mk.am: Reenabled build outside ource tree ndb/config/type_util.mk.am: Reenabled build outside ource tree ndb/src/kernel/Makefile.am: Reenabled build outside ource tree
Diffstat (limited to 'libmysql_r')
-rw-r--r--libmysql_r/Makefile.am10
1 files changed, 5 insertions, 5 deletions
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am
index f7cf00321cb..31f6fdffd53 100644
--- a/libmysql_r/Makefile.am
+++ b/libmysql_r/Makefile.am
@@ -31,8 +31,6 @@ INCLUDES = @MT_INCLUDES@ \
## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
include $(top_srcdir)/libmysql/Makefile.shared
-libmysql_dir = $(top_srcdir)/libmysql
-
libmysqlclient_r_la_SOURCES = $(target_sources)
libmysqlclient_r_la_LIBADD = $(target_libadd)
libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
@@ -40,7 +38,9 @@ libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
# This is called from the toplevel makefile
link_sources:
set -x; \
- for f in `cd $(libmysql_dir) && echo *.[ch]`; do \
- rm -f $$f; \
- @LN_CP_F@ $(libmysql_dir)/$$f $$f; \
+ for d in $(top_srcdir)/libmysql $(top_builddir)/libmysql; do \
+ for f in `cd $$d && echo *.[ch]`; do \
+ rm -f $$f; \
+ @LN_CP_F@ $$d/$$f $$f; \
+ done; \
done