Commit ca252acb authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/dlenev/src/mysql-4.1-merges
parents e2c869f2 e46d235a

client/Makefile.am

+4 −14
Original line number Diff line number Diff line
@@ -20,9 +20,8 @@ 
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)

LDADD=				@CLIENT_EXTRA_LDFLAGS@ \

                                $(top_builddir)/libmysql/libmysqlclient.la

bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \

 mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen

noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h \
@@ -31,19 +30,10 @@ mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc 
mysqladmin_SOURCES =		mysqladmin.cc

mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)

mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLAGS)

mysql_DEPENDENCIES=		$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

mysqladmin_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

mysqlcheck_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

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) $(REGEXLIB) $(DEPLIB)

mysqltest_LDADD =		$(REGEXLIB) $(LDADD)

mysqltest_SOURCES=		mysqltest.c $(top_srcdir)/mysys/my_getsystime.c

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

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

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

mysqlmanagerc_SOURCES =   mysqlmanagerc.c 

mysqlmanagerc_DEPENDENCIES=   	$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

sql_src=log_event.h log_event.cc



# Fix for mit-threads

regex/Makefile.am

+1 −2
Original line number Diff line number Diff line
@@ -17,12 +17,11 @@ 


INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include

noinst_LIBRARIES =	libregex.a

LDADD =			libregex.a ../strings/libmystrings.a

LDADD=			libregex.a $(top_builddir)/strings/libmystrings.a

noinst_HEADERS =	cclass.h cname.h regex2.h utils.h engine.c regex.h

libregex_a_SOURCES =	regerror.c regcomp.c regexec.c regfree.c reginit.c

noinst_PROGRAMS =	re

re_SOURCES =		split.c debug.c main.c

re_DEPENDENCIES=	$(LIBRARIES)

re_LDFLAGS= @NOINST_LDFLAGS@

EXTRA_DIST =		tests CHANGES COPYRIGHT WHATSNEW regexp.c \

			debug.ih engine.ih main.ih regcomp.ih regerror.ih \

strings/Makefile.am

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ endif 


libmystrings_a_SOURCES = $(ASRCS) $(CSRCS)

noinst_PROGRAMS = conf_to_src

DISTCLEANFILES = ctype_autoconf.c

# Default charset definitions

EXTRA_DIST =		ctype-big5.c ctype-czech.c ctype-euc_kr.c ctype-win1250ch.c \

                        ctype-gb2312.c ctype-gbk.c ctype-sjis.c ctype-utf8.c \