diff options
author | unknown <joreland@mysql.com> | 2004-11-24 12:33:09 +0100 |
---|---|---|
committer | unknown <joreland@mysql.com> | 2004-11-24 12:33:09 +0100 |
commit | 3a56452c77ac116082d7734fa6e7f7f9ccc4b557 (patch) | |
tree | 81d48373b87f1a455e1267f70195c87546377597 /client/Makefile.am | |
parent | 8998e128b6e3ccb1513a601cb350e22244067237 (diff) | |
download | mariadb-git-3a56452c77ac116082d7734fa6e7f7f9ccc4b557.tar.gz |
merge error
Diffstat (limited to 'client/Makefile.am')
-rw-r--r-- | client/Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 0b261b1b105..fa317367f71 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -26,7 +26,6 @@ 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) |