diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-11-27 18:29:50 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-11-27 18:29:50 +0100 |
| commit | 8d6f67f3269917f0353c94e387a04e629445f0ce (patch) | |
| tree | 6e69443c2ba64be6a55243ae050033ea5a4669c1 /libmysqld | |
| parent | 6de6b97eeed6db587d1c856178262d7ead396a9b (diff) | |
| download | mariadb-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 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index e121e4b8d6e..9582084ba5d 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -25,9 +25,11 @@ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" -INCLUDES= @MT_INCLUDES@ @bdb_includes@ \ +INCLUDES= @MT_INCLUDES@ @bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \ -I$(top_builddir)/include -I$(top_srcdir)/include \ - -I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples -I$(top_srcdir)/regex \ + -I$(top_builddir)/sql -I$(top_srcdir)/sql \ + -I$(top_srcdir)/sql/examples \ + -I$(top_srcdir)/regex \ $(openssl_includes) @ZLIB_INCLUDES@ noinst_LIBRARIES = libmysqld_int.a @@ -118,16 +120,28 @@ endif #libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@ #CLEANFILES = $(libmysqld_la_LIBADD) libmysqld.la -# This is called from the toplevel makefile +# This is called from the toplevel makefile. If we can link now +# to an existing file in source, we do that, else we assume it +# will show up in the build tree eventually (generated file). link_sources: set -x; \ for f in $(sqlsources); do \ rm -f $$f; \ - @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \ + if test -e $(top_srcdir)/sql/$$f ; \ + then \ + @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \ + else \ + @LN_CP_F@ $(top_builddir)/sql/$$f $$f; \ + fi ; \ done; \ for f in $(libmysqlsources); do \ rm -f $$f; \ - @LN_CP_F@ $(top_srcdir)/libmysql/$$f $$f; \ + if test -e $(top_srcdir)/libmysql/$$f ; \ + then \ + @LN_CP_F@ $(top_srcdir)/libmysql/$$f $$f; \ + else \ + @LN_CP_F@ $(top_builddir)/libmysql/$$f $$f; \ + fi ; \ done; \ for f in $(sqlexamplessources); do \ rm -f $$f; \ |