summaryrefslogtreecommitdiff
path: root/client/Makefile.am
diff options
context:
space:
mode:
authorjoreland@mysql.com <>2004-11-24 12:33:09 +0100
committerjoreland@mysql.com <>2004-11-24 12:33:09 +0100
commit5ac41f60e357958f5c6089d84efceba14a8cdf56 (patch)
tree81d48373b87f1a455e1267f70195c87546377597 /client/Makefile.am
parentfab3038dff0f928cb5319f291e2a24957dfeb8c5 (diff)
downloadmariadb-git-5ac41f60e357958f5c6089d84efceba14a8cdf56.tar.gz
merge error
Diffstat (limited to 'client/Makefile.am')
-rw-r--r--client/Makefile.am1
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)