diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-11-27 18:47:07 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-11-27 18:47:07 +0100 |
| commit | 14ba2178eda2061b033786372a29cb944019c9af (patch) | |
| tree | ba91e19692394bc120e136e14093142cfc58bac9 /libmysqld | |
| parent | f47d5500c3e2b30d1b9c909bb735054ab488c3d6 (diff) | |
| parent | 8d6f67f3269917f0353c94e387a04e629445f0ce (diff) | |
| download | mariadb-git-14ba2178eda2061b033786372a29cb944019c9af.tar.gz | |
Merge mysql.com:/home/kent/bk/mysql-4.1
into mysql.com:/home/kent/bk/mysql-5.0
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
bdb/dist/gen_rec.awk:
Auto merged
libmysql_r/Makefile.am:
Auto merged
ndb/config/type_ndbapitools.mk.am:
Auto merged
ndb/src/kernel/Makefile.am:
Auto merged
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 89b473fb815..cdd71724166 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -25,9 +25,10 @@ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" -INCLUDES= @bdb_includes@ \ +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_builddir)/sql -I$(top_srcdir)/sql \ + -I$(top_srcdir)/sql/examples \ -I$(top_srcdir)/regex \ $(openssl_includes) @ZLIB_INCLUDES@ @@ -118,16 +119,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; \ |