diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-18 22:06:51 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-18 22:06:51 +0000 |
| commit | be7d46a962fa4da6171531927653794627abcdff (patch) | |
| tree | 04952ee00159cf23220c356b161a4e0e83bb5b17 /client/Makefile.am | |
| parent | 18f12ee494d96a7e2caf6ab5d725fe6d371f9cba (diff) | |
| parent | 1af6e72e4ebb65a392658a2dab795fda68564af0 (diff) | |
| download | mariadb-git-be7d46a962fa4da6171531927653794627abcdff.tar.gz | |
Merge
client/Makefile.am:
Auto merged
client/mysqladmin.cc:
Auto merged
configure.in:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmclient/ndb_mgmclient.hpp:
Auto merged
ndb/src/mgmclient/ndb_mgmclient.h:
Auto merged
ndb/tools/restore/restore_main.cpp:
SCCS merged
Diffstat (limited to 'client/Makefile.am')
| -rw-r--r-- | client/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 07167d97df5..f59395ae026 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -27,6 +27,7 @@ bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \ mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \ client_priv.h +mysqladmin_SOURCES = mysqladmin.cc mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc mysqladmin_SOURCES = mysqladmin.cc mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS) |