summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <hf@deer.(none)>2004-05-13 17:38:33 +0500
committerunknown <hf@deer.(none)>2004-05-13 17:38:33 +0500
commitae95f38200b226191a290cf840e0d06b17304f82 (patch)
tree42b38a9216af0f47707948702f3e3abf1944ccb5 /libmysqld
parentb94ab162cf208faecef723ad57c3e9cf11584121 (diff)
parent5e992944b5fbcd8a3b00f5fe78d5ea67997af80e (diff)
downloadmariadb-git-ae95f38200b226191a290cf840e0d06b17304f82.tar.gz
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.ps
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/examples/Makefile.am10
1 files changed, 9 insertions, 1 deletions
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am
index fe56926039d..b11db65baf6 100644
--- a/libmysqld/examples/Makefile.am
+++ b/libmysqld/examples/Makefile.am
@@ -1,11 +1,16 @@
-noinst_PROGRAMS = mysqltest mysql
+noinst_PROGRAMS = mysqltest mysql client_test
client_sources = $(mysqltest_SOURCES) $(mysql_SOURCES)
+tests_sources= $(client_test_SOURCES)
link_sources:
for f in $(client_sources); do \
rm -f $(srcdir)/$$f; \
@LN_CP_F@ $(srcdir)/../../client/$$f $(srcdir)/$$f; \
done;
+ for f in $(tests_sources); do \
+ rm -f $(srcdir)/$$f; \
+ @LN_CP_F@ $(srcdir)/../../tests/$$f $(srcdir)/$$f; \
+ done;
DEFS = -DEMBEDDED_LIBRARY
INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \
@@ -21,8 +26,11 @@ mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \
my_readline.h sql_string.h completion_hash.h
mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD)
+client_test_SOURCES = client_test.c
+
clean:
rm -f $(client_sources)
+ rm -f $(tests_sources)
# Don't update the files from bitkeeper
%::SCCS/s.%