diff options
| author | unknown <tomas@mc05.(none)> | 2004-05-13 14:38:34 +0200 |
|---|---|---|
| committer | unknown <tomas@mc05.(none)> | 2004-05-13 14:38:34 +0200 |
| commit | 218a0220b50174c030e79fb3d9a82bfd21933e37 (patch) | |
| tree | b9ddecfda40b5cf104a70dcd1396eda19274cec9 | |
| parent | 97ae6904dfe5cc7ca486e50362103a72f68c557c (diff) | |
| parent | ae95f38200b226191a290cf840e0d06b17304f82 (diff) | |
| download | mariadb-git-218a0220b50174c030e79fb3d9a82bfd21933e37.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space/tomas/mysql-4.1-ndb
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | libmysqld/examples/Makefile.am | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index d116fd29c41..338bc04fabc 100644 --- a/.bzrignore +++ b/.bzrignore @@ -779,3 +779,4 @@ ndb/config/config.mk ndb/src/common/mgmcommon/printConfig/*.d ndb/src/mgmclient/test_cpcd/*.d *.d +libmysqld/examples/client_test.c 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.% |