Commit a2b3d71d authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents 3790b5fd 0babddfd

client/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
INCLUDES =			-I$(top_srcdir)/include -I$(top_srcdir)/regex \

				$(openssl_includes)

LIBS =				@CLIENT_LIBS@

DEPLIB=				../libmysql/libmysqlclient.la \

				@ndb_mgmclient_libs@

DEPLIB=				@ndb_mgmclient_libs@ \

				../libmysql/libmysqlclient.la

LDADD =				@CLIENT_EXTRA_LDFLAGS@ $(DEPLIB)

bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \

 mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen