summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.munch@oracle.com>2012-07-10 10:04:57 +0200
committerBjorn Munch <bjorn.munch@oracle.com>2012-07-10 10:04:57 +0200
commitfcc53fa77cc514a9bd5b07adf905c583bb063f4b (patch)
treeff18139dbcb6be54e931d74476858eb56afc1356
parentdb33b4994d92bb1da17c02981f94d2ec148d8048 (diff)
downloadmariadb-git-fcc53fa77cc514a9bd5b07adf905c583bb063f4b.tar.gz
mysql_client_test did not build within limbysqld/examples
-rw-r--r--libmysqld/examples/CMakeLists.txt3
-rw-r--r--libmysqld/examples/Makefile.am3
2 files changed, 4 insertions, 2 deletions
diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt
index 2b900a1fa8f..d7f994d9b9f 100644
--- a/libmysqld/examples/CMakeLists.txt
+++ b/libmysqld/examples/CMakeLists.txt
@@ -17,7 +17,8 @@
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/libmysqld/include
${CMAKE_SOURCE_DIR}/regex
- ${CMAKE_SOURCE_DIR}/zlib
+ ${CMAKE_SOURCE_DIR}/zlib
+ ${CMAKE_SOURCE_DIR}/tests
${CMAKE_SOURCE_DIR}/extra/yassl/include)
# Currently does not work with DBUG, there are missing symbols reported.
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am
index a732b209e27..a0f1a64ffdc 100644
--- a/libmysqld/examples/Makefile.am
+++ b/libmysqld/examples/Makefile.am
@@ -35,7 +35,7 @@ link_sources:
DEFS = -DEMBEDDED_LIBRARY
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \
-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
- $(openssl_includes)
+ -I$(top_srcdir)/tests $(openssl_includes)
LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS) \
@NDB_SCI_LIBS@
@@ -51,6 +51,7 @@ mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD)
mysql_client_test_embedded_LINK = $(CXXLINK)
nodist_mysql_client_test_embedded_SOURCES = mysql_client_test.c
+mysql_client_test.o: $(top_srcdir)/tests/mysql_client_fw.c
# Don't update the files from bitkeeper
%::SCCS/s.%