Commit cfe017a3 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-patches
parents 05cb2737 d408a4aa

client/Makefile.am

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/regex \ 
				$(openssl_includes)

LIBS =				@CLIENT_LIBS@

DEPLIB=				../libmysql/libmysqlclient.la

REGEXLIB=			../regex/libregex.a

LDADD =				@CLIENT_EXTRA_LDFLAGS@ $(DEPLIB)

bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \

 mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen
@@ -37,8 +38,8 @@ mysqlshow_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB) 
mysqldump_DEPENDENCIES=		$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

mysqlimport_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

mysqltest_SOURCES=		mysqltest.c ../mysys/my_getsystime.c

mysqltest_DEPENDENCIES=   	$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

mysqltest_LDADD =		$(LDADD) $(top_builddir)/regex/libregex.a

mysqltest_DEPENDENCIES=   	$(LIBRARIES) $(pkglib_LTLIBRARIES) $(REGEXLIB) $(DEPLIB)

mysqltest_LDADD =		$(REGEXLIB) $(LDADD)

mysqlbinlog_SOURCES =   mysqlbinlog.cc ../mysys/mf_tempdir.c

mysqlbinlog_DEPENDENCIES=   	$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

mysqlmanagerc_SOURCES =   mysqlmanagerc.c