| List: | Commits | « Previous MessageNext Message » | |
| From: | Monty Taylor | Date: | April 23 2008 6:27am |
| Subject: | bk commit into 5.1 tree (mtaylor:1.2579) BUG#29791 | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.1 repository of mtaylor. When mtaylor does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2008-04-22 21:27:27-07:00, mtaylor@solace.(none) +32 -0 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. BUILD/autorun.sh@stripped, 2008-04-22 21:27:21-07:00, mtaylor@solace.(none) +1 -1 Turned off warnings about non-gnu make portability, since we don't support non-gnu make anyway. client/Makefile.am@stripped, 2008-04-22 21:27:21-07:00, mtaylor@solace.(none) +1 -0 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. config/ac-macros/zlib.m4@stripped, 2008-04-22 21:27:21-07:00, mtaylor@solace.(none) +2 -1 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. configure.in@stripped, 2008-04-22 21:27:21-07:00, mtaylor@solace.(none) +23 -3 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. dbug/Makefile.am@stripped, 2008-04-22 21:27:21-07:00, mtaylor@solace.(none) +3 -3 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. extra/Makefile.am@stripped, 2008-04-22 21:27:21-07:00, mtaylor@solace.(none) +2 -2 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. libmysql/Makefile.am@stripped, 2008-04-22 21:27:22-07:00, mtaylor@solace.(none) +1 -1 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. libmysql_r/Makefile.am@stripped, 2008-04-22 21:27:22-07:00, mtaylor@solace.(none) +1 -1 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. mysys/Makefile.am@stripped, 2008-04-22 21:27:22-07:00, mtaylor@solace.(none) +57 -54 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. server-tools/instance-manager/Makefile.am@stripped, 2008-04-22 21:27:22-07:00, mtaylor@solace.(none) +3 -3 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. sql/Makefile.am@stripped, 2008-04-22 21:27:22-07:00, mtaylor@solace.(none) +4 -3 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/archive/Makefile.am@stripped, 2008-04-22 21:27:22-07:00, mtaylor@solace.(none) +6 -6 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/heap/Makefile.am@stripped, 2008-04-22 21:27:22-07:00, mtaylor@solace.(none) +6 -6 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/myisam/Makefile.am@stripped, 2008-04-22 21:27:23-07:00, mtaylor@solace.(none) +27 -27 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/ndb/config/type_ndbapitools.mk.am@stripped, 2008-04-22 21:27:23-07:00, mtaylor@solace.(none) +3 -3 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/ndb/src/Makefile.am@stripped, 2008-04-22 21:27:23-07:00, mtaylor@solace.(none) +4 -1 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/ndb/src/common/util/Makefile.am@stripped, 2008-04-22 21:27:23-07:00, mtaylor@solace.(none) +3 -3 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/ndb/src/cw/cpcd/Makefile.am@stripped, 2008-04-22 21:27:23-07:00, mtaylor@solace.(none) +3 -3 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/ndb/src/kernel/Makefile.am@stripped, 2008-04-22 21:27:23-07:00, mtaylor@solace.(none) +4 -3 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/ndb/src/kernel/blocks/Makefile.am@stripped, 2008-04-22 21:27:23-07:00, mtaylor@solace.(none) +3 -3 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/ndb/src/kernel/blocks/backup/Makefile.am@stripped, 2008-04-22 21:27:24-07:00, mtaylor@solace.(none) +3 -3 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/ndb/src/kernel/blocks/dbdict/Makefile.am@stripped, 2008-04-22 21:27:24-07:00, mtaylor@solace.(none) +6 -6 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/ndb/src/kernel/blocks/dbdih/Makefile.am@stripped, 2008-04-22 21:27:24-07:00, mtaylor@solace.(none) +3 -3 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/ndb/src/kernel/blocks/dblqh/Makefile.am@stripped, 2008-04-22 21:27:24-07:00, mtaylor@solace.(none) +3 -3 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/ndb/src/kernel/blocks/dbtup/Makefile.am@stripped, 2008-04-22 21:27:24-07:00, mtaylor@solace.(none) +3 -3 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/ndb/src/kernel/vm/Makefile.am@stripped, 2008-04-22 21:27:24-07:00, mtaylor@solace.(none) +9 -9 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/ndb/src/mgmclient/Makefile.am@stripped, 2008-04-22 21:27:24-07:00, mtaylor@solace.(none) +3 -3 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/ndb/src/mgmsrv/Makefile.am@stripped, 2008-04-22 21:27:25-07:00, mtaylor@solace.(none) +3 -3 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/ndb/src/ndbapi/Makefile.am@stripped, 2008-04-22 21:27:25-07:00, mtaylor@solace.(none) +4 -3 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. storage/ndb/test/run-test/Makefile.am@stripped, 2008-04-22 21:27:25-07:00, mtaylor@solace.(none) +3 -3 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. strings/Makefile.am@stripped, 2008-04-22 21:27:25-07:00, mtaylor@solace.(none) +9 -9 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. unittest/mysys/Makefile.am@stripped, 2008-04-22 21:27:25-07:00, mtaylor@solace.(none) +4 -3 BUG#29791 relocation R_X86_64_32 against `a local symbol' Changed libmysys, libmystrings and libdbug from normal libs to noinst libtool helper libs. The will no longer be installed, and all of the necessary symbols from them are added directly to libndbclient et al. The upside here is that NDB API programs now only need to link against -lndbclient. diff -Nrup a/BUILD/autorun.sh b/BUILD/autorun.sh --- a/BUILD/autorun.sh 2007-10-29 14:48:18 -07:00 +++ b/BUILD/autorun.sh 2008-04-22 21:27:21 -07:00 @@ -27,5 +27,5 @@ $LIBTOOLIZE --automake --force --copy || # --add-missing instructs automake to install missing auxiliary files # and --force to overwrite them if they already exist -automake --add-missing --force --copy || die "Can't execute automake" +automake --add-missing --force --copy --gnu -W no-portability || die "Can't execute automake" autoconf || die "Can't execute autoconf" diff -Nrup a/client/Makefile.am b/client/Makefile.am --- a/client/Makefile.am 2007-11-01 08:49:37 -07:00 +++ b/client/Makefile.am 2008-04-22 21:27:21 -07:00 @@ -54,6 +54,7 @@ bin_PROGRAMS = mysql \ mysql_SOURCES = mysql.cc readline.cc sql_string.cc \ completion_hash.cc mysql_LDADD = @readline_link@ @TERMCAP_LIB@ \ + @ZLIB_LIBS@ \ $(LDADD) $(CXXLDFLAGS) mysqladmin_SOURCES = mysqladmin.cc diff -Nrup a/config/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4 --- a/config/ac-macros/zlib.m4 2007-08-30 16:18:56 -07:00 +++ b/config/ac-macros/zlib.m4 2008-04-22 21:27:21 -07:00 @@ -19,7 +19,8 @@ AC_DEFUN([MYSQL_CHECK_ZLIB_DIR], [ save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS" -LIBS="$LIBS $ZLIB_LIBS" +#We don't really need this everywhere. Use ZLIB_LIBS in Makefiles. +#LIBS="$LIBS $ZLIB_LIBS" if test X"$with_server" = Xno then zlibsym=zlibVersion diff -Nrup a/configure.in b/configure.in --- a/configure.in 2008-04-08 01:29:04 -07:00 +++ b/configure.in 2008-04-22 21:27:21 -07:00 @@ -23,7 +23,7 @@ DOT_FRM_VERSION=6 # See the libtool docs for information on how to do shared lib versions. SHARED_LIB_MAJOR_VERSION=16 SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 -NDB_SHARED_LIB_MAJOR_VERSION=3 +NDB_SHARED_LIB_MAJOR_VERSION=4 NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0 # Set all version vars based on $VERSION. How do we do this more elegant ? @@ -356,6 +356,7 @@ case "$target_os" in fi ;; esac + AC_SUBST(CC) AC_SUBST(CFLAGS) AC_SUBST(CXX) @@ -838,20 +839,32 @@ AC_CHECK_HEADERS([xfs/xfs.h]) # and defines HAVE_LIBM etc #-------------------------------------------------------------------- +_libs=${LIBS} +LIBS='' AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity)) +M_LIBS=${LIBS} +LIBS=${_libs} +_libs=${LIBS} +LIBS='' AC_CHECK_LIB(nsl_r, gethostbyname_r, [], AC_CHECK_LIB(nsl, gethostbyname_r)) AC_CHECK_FUNC(gethostbyname_r) - -AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) AC_CHECK_FUNC(yp_get_default_domain, , AC_CHECK_LIB(nsl, yp_get_default_domain)) +NSL_LIBS=${LIBS} +LIBS=${_libs} + +AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open)) # This may get things to compile even if bind-8 is installed AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind)) # Check if crypt() exists in libc or libcrypt, sets LIBS if needed +_libs=${LIBS} +LIBS='' AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) +CRYPT_LIBS=${LIBS} +LIBS=${_libs} # See if we need a library for address lookup. AC_SEARCH_LIBS(inet_aton, [socket nsl resolv]) @@ -1684,18 +1697,22 @@ then AC_DEFINE([DBUG_ON], [1], [Use libdbug]) CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DSAFE_MUTEX $CFLAGS" CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS" + DEBUG_BUILD=yes elif test "$with_debug" = "full" then # Full debug. Very slow in some cases AC_DEFINE([DBUG_ON], [1], [Use libdbug]) CFLAGS="$DEBUG_CFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS" CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS" + DEBUG_BUILD=yes else # Optimized version. No debug AC_DEFINE([DBUG_OFF], [1], [Don't use libdbug]) CFLAGS="$OPTIMIZE_CFLAGS $CFLAGS" CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS" + DEBUG_BUILD=no fi +AM_CONDITIONAL(BUILD_DEBUG, test "$with_debug" = "full" -o "$with_debug" = "yes") # If we should allow error injection tests AC_ARG_WITH(error-inject, @@ -2678,6 +2695,9 @@ sql_client_dirs="$sql_client_dirs client CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS" +AC_SUBST(M_LIBS) +AC_SUBST(CRYPT_LIBS) +AC_SUBST(NSL_LIBS) AC_SUBST(CLIENT_LIBS) AC_SUBST(CLIENT_THREAD_LIBS) AC_SUBST(NON_THREADED_LIBS) diff -Nrup a/dbug/Makefile.am b/dbug/Makefile.am --- a/dbug/Makefile.am 2006-12-30 16:06:32 -08:00 +++ b/dbug/Makefile.am 2008-04-22 21:27:21 -07:00 @@ -16,10 +16,10 @@ # MA 02111-1307, USA INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -LDADD = libdbug.a ../mysys/libmysys.a ../strings/libmystrings.a -pkglib_LIBRARIES = libdbug.a +LDADD = libdbug.la ../mysys/libmysys.la ../strings/libmystrings.la ${ZLIB_LIBS} +noinst_LTLIBRARIES = libdbug.la noinst_HEADERS = dbug_long.h -libdbug_a_SOURCES = dbug.c sanity.c +libdbug_la_SOURCES = dbug.c sanity.c EXTRA_DIST = CMakeLists.txt example1.c example2.c example3.c \ user.r monty.doc dbug_add_tags.pl \ my_main.c main.c factorial.c dbug_analyze.c \ diff -Nrup a/extra/Makefile.am b/extra/Makefile.am --- a/extra/Makefile.am 2007-08-30 16:23:48 -07:00 +++ b/extra/Makefile.am 2008-04-22 21:27:21 -07:00 @@ -15,8 +15,8 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/sql -LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ - ../dbug/libdbug.a ../strings/libmystrings.a \ +LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.la \ + ../dbug/libdbug.la ../strings/libmystrings.la \ $(ZLIB_LIBS) BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \ $(top_builddir)/include/sql_state.h \ diff -Nrup a/libmysql/Makefile.am b/libmysql/Makefile.am --- a/libmysql/Makefile.am 2007-11-22 03:34:11 -08:00 +++ b/libmysql/Makefile.am 2008-04-22 21:27:22 -07:00 @@ -22,7 +22,7 @@ target = libmysqlclient.la target_defs = -DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@ -LIBS = @CLIENT_LIBS@ +LIBS = @CLIENT_LIBS@ @M_LIBS@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ $(openssl_includes) @ZLIB_INCLUDES@ diff -Nrup a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am --- a/libmysql_r/Makefile.am 2007-10-08 11:55:22 -07:00 +++ b/libmysql_r/Makefile.am 2008-04-22 21:27:22 -07:00 @@ -22,7 +22,7 @@ target = libmysqlclient_r.la target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@ -LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ +LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ @M_LIBS@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ $(openssl_includes) @ZLIB_INCLUDES@ diff -Nrup a/mysys/Makefile.am b/mysys/Makefile.am --- a/mysys/Makefile.am 2008-03-28 12:08:26 -07:00 +++ b/mysys/Makefile.am 2008-04-22 21:27:22 -07:00 @@ -18,10 +18,10 @@ MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \ -I$(top_srcdir)/include -I$(srcdir) -pkglib_LIBRARIES = libmysys.a -LDADD = libmysys.a $(top_builddir)/strings/libmystrings.a $(top_builddir)/dbug/libdbug.a +noinst_LTLIBRARIES = libmysys.la +LDADD = libmysys.la $(top_builddir)/strings/libmystrings.la $(top_builddir)/dbug/libdbug.la noinst_HEADERS = mysys_priv.h my_static.h my_handler_errors.h -libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ +libmysys_la_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ mf_path.c mf_loadpath.c my_file.c \ my_open.c my_create.c my_dup.c my_seek.c my_read.c \ my_pread.c my_write.c my_getpagesize.c \ @@ -52,12 +52,14 @@ libmysys_a_SOURCES = my_init.c my_get my_gethostbyname.c rijndael.c my_aes.c sha1.c \ my_handler.c my_netware.c my_largepage.c \ my_memmem.c \ - my_windac.c my_access.c base64.c my_libwrap.c -EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \ + my_windac.c my_access.c base64.c my_libwrap.c \ + thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \ thr_mutex.c thr_rwlock.c \ - CMakeLists.txt mf_soundex.c \ + mf_soundex.c \ my_conio.c my_wincond.c my_winthread.c -libmysys_a_LIBADD = @THREAD_LOBJECTS@ +EXTRA_DIST = CMakeLists.txt +#libmysys_la_LIBADD = @THREAD_LOBJECTS@ +libmysys_la_LIBADD = @ZLIB_LIB@ # test_dir_DEPENDENCIES= $(LIBRARIES) # testhash_DEPENDENCIES= $(LIBRARIES) # test_charset_DEPENDENCIES= $(LIBRARIES) @@ -71,7 +73,7 @@ DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" -DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \ @DEFS@ -libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@ +libmysys_la_DEPENDENCIES= @THREAD_LOBJECTS@ # I hope this always does the right thing. Otherwise this is only test programs FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@ @@ -80,51 +82,52 @@ FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $( # The CP .. RM stuff is to avoid problems with some compilers (like alpha ccc) # which automaticly removes the object files you use to compile a final program # - -test_bitmap$(EXEEXT): my_bitmap.c $(LIBRARIES) - $(LINK) $(FLAGS) -DMAIN ./my_bitmap.c $(LDADD) $(LIBS) - -test_priority_queue$(EXEEXT): queues.c $(LIBRARIES) - $(LINK) $(FLAGS) -DMAIN ./queues.c $(LDADD) $(LIBS) - -test_thr_alarm$(EXEEXT): thr_alarm.c $(LIBRARIES) - $(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c - $(LINK) $(FLAGS) -DMAIN ./test_thr_alarm.c $(LDADD) $(LIBS) - $(RM) -f ./test_thr_alarm.c - -test_thr_lock$(EXEEXT): thr_lock.c $(LIBRARIES) - $(CP) $(srcdir)/thr_lock.c test_thr_lock.c - $(LINK) $(FLAGS) -DMAIN ./test_thr_lock.c $(LDADD) $(LIBS) - $(RM) -f ./test_thr_lock.c - -test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LIBRARIES) - $(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c - $(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS) - $(RM) -f test_vsnprintf.c - -test_io_cache$(EXEEXT): mf_iocache.c $(LIBRARIES) - $(CP) $(srcdir)/mf_iocache.c test_io_cache.c - $(LINK) $(FLAGS) -DMAIN ./test_io_cache.c $(LDADD) $(LIBS) - $(RM) -f test_io_cache.c - -test_dir$(EXEEXT): test_dir.c $(LIBRARIES) - $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS) - -test_charset$(EXEEXT): test_charset.c $(LIBRARIES) - $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS) - -testhash$(EXEEXT): testhash.c $(LIBRARIES) - $(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS) - -test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LIBRARIES) - $(CP) $(srcdir)/my_gethwaddr.c ./test_gethwaddr.c - $(LINK) $(FLAGS) -DMAIN ./test_gethwaddr.c $(LDADD) $(LIBS) - $(RM) -f ./test_gethwaddr.c - -test_base64$(EXEEXT): base64.c $(LIBRARIES) - $(CP) $(srcdir)/base64.c ./test_base64.c - $(LINK) $(FLAGS) -DMAIN ./test_base64.c $(LDADD) $(LIBS) - $(RM) -f ./test_base64.c - +#noinst_PROGRAMS = test_bitmap test_priority_queue test_thr_alarm test_thr_lock test_vsnprintf +#test_bitmap_SOURCES = my_bitmap.c +#test_bitmap_CFLAGS = -DMAIN +# +# +#test_priority_queue$(EXEEXT): queues.c $(LIBRARIES) +# $(LINK) $(FLAGS) -DMAIN ./queues.c $(LDADD) $(LIBS) +# +#test_thr_alarm$(EXEEXT): thr_alarm.c $(LIBRARIES) +# $(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c +# $(LINK) $(FLAGS) -DMAIN ./test_thr_alarm.c $(LDADD) $(LIBS) +# $(RM) -f ./test_thr_alarm.c +# +#test_thr_lock$(EXEEXT): thr_lock.c $(LIBRARIES) +# $(CP) $(srcdir)/thr_lock.c test_thr_lock.c +# $(LINK) $(FLAGS) -DMAIN ./test_thr_lock.c $(LDADD) $(LIBS) +# $(RM) -f ./test_thr_lock.c +# +#test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LIBRARIES) +# $(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c +# $(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS) +# $(RM) -f test_vsnprintf.c +# +#test_io_cache$(EXEEXT): mf_iocache.c $(LIBRARIES) +# $(CP) $(srcdir)/mf_iocache.c test_io_cache.c +# $(LINK) $(FLAGS) -DMAIN ./test_io_cache.c $(LDADD) $(LIBS) +# $(RM) -f test_io_cache.c +# +#test_dir$(EXEEXT): test_dir.c $(LIBRARIES) +# $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS) +# +#test_charset$(EXEEXT): test_charset.c $(LIBRARIES) +# $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS) +# +#testhash$(EXEEXT): testhash.c $(LIBRARIES) +# $(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS) +# +#test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LIBRARIES) +# $(CP) $(srcdir)/my_gethwaddr.c ./test_gethwaddr.c +# $(LINK) $(FLAGS) -DMAIN ./test_gethwaddr.c $(LDADD) $(LIBS) +# $(RM) -f ./test_gethwaddr.c +# +#test_base64$(EXEEXT): base64.c $(LIBRARIES) +# $(CP) $(srcdir)/base64.c ./test_base64.c +# $(LINK) $(FLAGS) -DMAIN ./test_base64.c $(LDADD) $(LIBS) +# $(RM) -f ./test_base64.c +# # Don't update the files from bitkeeper %::SCCS/s.% diff -Nrup a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am --- a/server-tools/instance-manager/Makefile.am 2007-02-18 04:45:24 -08:00 +++ b/server-tools/instance-manager/Makefile.am 2008-04-22 21:27:22 -07:00 @@ -88,9 +88,9 @@ mysqlmanager_LDADD= @CLIENT_EXTRA_LDFLAG liboptions.la \ libnet.a \ $(top_builddir)/vio/libvio.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a \ - $(top_builddir)/dbug/libdbug.a \ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/strings/libmystrings.la \ + $(top_builddir)/dbug/libdbug.la \ @openssl_libs@ @yassl_libs@ @ZLIB_LIBS@ EXTRA_DIST = WindowsService.cpp WindowsService.h IMService.cpp \ diff -Nrup a/sql/Makefile.am b/sql/Makefile.am --- a/sql/Makefile.am 2008-04-08 01:29:05 -07:00 +++ b/sql/Makefile.am 2008-04-22 21:27:22 -07:00 @@ -33,16 +33,17 @@ noinst_LTLIBRARIES= libndb.la \ udf_example.la SUPPORTING_LIBS = $(top_builddir)/vio/libvio.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ $(top_builddir)/regex/libregex.a \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/strings/libmystrings.la mysqld_DEPENDENCIES= @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@ mysqld_LDADD = libndb.la \ @MYSQLD_EXTRA_LDFLAGS@ \ @pstack_libs@ \ @mysql_plugin_libs@ \ + @CRYPT_LIBS@ \ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \ $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@ diff -Nrup a/storage/archive/Makefile.am b/storage/archive/Makefile.am --- a/storage/archive/Makefile.am 2008-01-02 05:00:42 -08:00 +++ b/storage/archive/Makefile.am 2008-04-22 21:27:22 -07:00 @@ -50,17 +50,17 @@ libarchive_a_SOURCES = ha_archive.cc azi archive_test_SOURCES = archive_test.c azio.c archive_test_CFLAGS = $(AM_CFLAGS) -archive_test_LDADD = $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a \ +archive_test_LDADD = $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la \ @ZLIB_LIBS@ archive_test_LDFLAGS = @NOINST_LDFLAGS@ archive_reader_SOURCES = archive_reader.c azio.c archive_reader_CFLAGS = $(AM_CFLAGS) -archive_reader_LDADD = $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a \ +archive_reader_LDADD = $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la \ @ZLIB_LIBS@ archive_reader_LDFLAGS = @NOINST_LDFLAGS@ diff -Nrup a/storage/heap/Makefile.am b/storage/heap/Makefile.am --- a/storage/heap/Makefile.am 2006-12-30 16:06:38 -08:00 +++ b/storage/heap/Makefile.am 2008-04-22 21:27:22 -07:00 @@ -31,14 +31,14 @@ noinst_PROGRAMS = hp_test1 hp_test2 noinst_LIBRARIES = libheap.a hp_test1_LDFLAGS = @NOINST_LDFLAGS@ hp_test1_LDADD = libheap.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la hp_test2_LDFLAGS = @NOINST_LDFLAGS@ hp_test2_LDADD = libheap.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la noinst_HEADERS = heapdef.h ha_heap.h libheap_a_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \ hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \ diff -Nrup a/storage/myisam/Makefile.am b/storage/myisam/Makefile.am --- a/storage/myisam/Makefile.am 2006-12-30 16:06:39 -08:00 +++ b/storage/myisam/Makefile.am 2008-04-22 21:27:23 -07:00 @@ -34,55 +34,55 @@ pkglib_LIBRARIES = libmyisam.a bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump myisamchk_DEPENDENCIES= $(LIBRARIES) myisamchk_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @M_LIBS@ myisamlog_DEPENDENCIES= $(LIBRARIES) myisamlog_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @M_LIBS@ myisampack_DEPENDENCIES=$(LIBRARIES) myisampack_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @M_LIBS@ noinst_PROGRAMS = mi_test1 mi_test2 mi_test3 rt_test sp_test #ft_test1 ft_eval noinst_HEADERS = myisamdef.h rt_index.h rt_key.h rt_mbr.h sp_defs.h \ fulltext.h ftdefs.h ft_test1.h ft_eval.h \ ha_myisam.h mi_test1_DEPENDENCIES= $(LIBRARIES) mi_test1_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @M_LIBS@ mi_test2_DEPENDENCIES= $(LIBRARIES) mi_test2_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @M_LIBS@ mi_test3_DEPENDENCIES= $(LIBRARIES) mi_test3_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @M_LIBS@ #ft_test1_DEPENDENCIES= $(LIBRARIES) #ft_eval_DEPENDENCIES= $(LIBRARIES) myisam_ftdump_DEPENDENCIES= $(LIBRARIES) myisam_ftdump_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @M_LIBS@ rt_test_DEPENDENCIES= $(LIBRARIES) rt_test_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @M_LIBS@ sp_test_DEPENDENCIES= $(LIBRARIES) sp_test_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @M_LIBS@ libmyisam_a_SOURCES = mi_open.c mi_extra.c mi_info.c mi_rkey.c \ mi_rnext.c mi_rnext_same.c \ mi_search.c mi_page.c mi_key.c mi_locking.c \ diff -Nrup a/storage/ndb/config/type_ndbapitools.mk.am b/storage/ndb/config/type_ndbapitools.mk.am --- a/storage/ndb/config/type_ndbapitools.mk.am 2007-06-11 08:51:37 -07:00 +++ b/storage/ndb/config/type_ndbapitools.mk.am 2008-04-22 21:27:23 -07:00 @@ -15,9 +15,9 @@ LDADD += \ $(top_builddir)/storage/ndb/src/libndbclient.la \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ @ZLIB_LIBS@ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ @ZLIB_LIBS@ INCLUDES += -I$(srcdir) \ -I$(top_builddir)/include \ diff -Nrup a/storage/ndb/src/Makefile.am b/storage/ndb/src/Makefile.am --- a/storage/ndb/src/Makefile.am 2007-01-19 16:54:51 -08:00 +++ b/storage/ndb/src/Makefile.am 2008-04-22 21:27:23 -07:00 @@ -25,6 +25,9 @@ libndbclient_la_LDFLAGS = -version-info libndbclient_la_LIBADD = \ ndbapi/libndbapi.la \ + $(top_builddir)/strings/libmystrings.la \ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ common/transporter/libtransporter.la \ common/debugger/libtrace.la \ common/debugger/signaldata/libsignaldataprint.la \ @@ -32,7 +35,7 @@ libndbclient_la_LIBADD = \ common/mgmcommon/libmgmsrvcommon.la \ common/logger/liblogger.la \ common/portlib/libportlib.la \ - common/util/libgeneral.la + common/util/libgeneral.la @ZLIB_LIBS@ windoze-dsp: libndbclient.dsp diff -Nrup a/storage/ndb/src/common/util/Makefile.am b/storage/ndb/src/common/util/Makefile.am --- a/storage/ndb/src/common/util/Makefile.am 2008-04-22 12:36:00 -07:00 +++ b/storage/ndb/src/common/util/Makefile.am 2008-04-22 21:27:23 -07:00 @@ -31,9 +31,9 @@ EXTRA_PROGRAMS = testBitmask testBitmask_SOURCES = testBitmask.cpp testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \ $(top_builddir)/storage/ndb/src/libndbclient.la \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/strings/libmystrings.la testBitmask.cpp : Bitmask.cpp rm -f testBitmask.cpp diff -Nrup a/storage/ndb/src/cw/cpcd/Makefile.am b/storage/ndb/src/cw/cpcd/Makefile.am --- a/storage/ndb/src/cw/cpcd/Makefile.am 2007-02-12 17:38:47 -08:00 +++ b/storage/ndb/src/cw/cpcd/Makefile.am 2008-04-22 21:27:23 -07:00 @@ -19,9 +19,9 @@ ndb_cpcd_SOURCES = main.cpp CPCD.cpp Pro LDADD_LOC = \ $(top_builddir)/storage/ndb/src/libndbclient.la \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ include $(top_srcdir)/storage/ndb/config/common.mk.am include $(top_srcdir)/storage/ndb/config/type_util.mk.am diff -Nrup a/storage/ndb/src/kernel/Makefile.am b/storage/ndb/src/kernel/Makefile.am --- a/storage/ndb/src/kernel/Makefile.am 2006-12-30 16:26:56 -08:00 +++ b/storage/ndb/src/kernel/Makefile.am 2008-04-22 21:27:23 -07:00 @@ -53,9 +53,10 @@ LDADD += \ $(top_builddir)/storage/ndb/src/mgmapi/libmgmapi.la \ $(top_builddir)/storage/ndb/src/common/portlib/libportlib.la \ $(top_builddir)/storage/ndb/src/common/util/libgeneral.la \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/strings/libmystrings.la \ + $(top_builddir)/zlib/libzlt.la @NDB_SCI_LIBS@ windoze-dsp: ndbd.dsp diff -Nrup a/storage/ndb/src/kernel/blocks/Makefile.am b/storage/ndb/src/kernel/blocks/Makefile.am --- a/storage/ndb/src/kernel/blocks/Makefile.am 2006-12-30 16:06:42 -08:00 +++ b/storage/ndb/src/kernel/blocks/Makefile.am 2008-04-22 21:27:23 -07:00 @@ -57,9 +57,9 @@ EXTRA_PROGRAMS = ndb_print_file ndb_print_file_SOURCES = print_file.cpp diskpage.cpp dbtup/tuppage.cpp ndb_print_file_LDFLAGS = @ndb_bin_am_ldflags@ \ $(top_builddir)/storage/ndb/src/libndbclient.la \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/strings/libmystrings.la include $(top_srcdir)/storage/ndb/config/common.mk.am include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am diff -Nrup a/storage/ndb/src/kernel/blocks/backup/Makefile.am b/storage/ndb/src/kernel/blocks/backup/Makefile.am --- a/storage/ndb/src/kernel/blocks/backup/Makefile.am 2006-12-30 16:06:42 -08:00 +++ b/storage/ndb/src/kernel/blocks/backup/Makefile.am 2008-04-22 21:27:24 -07:00 @@ -17,9 +17,9 @@ ndbtools_PROGRAMS = ndb_print_backup_fil ndb_print_backup_file_SOURCES = read.cpp ndb_print_backup_file_LDFLAGS = @ndb_bin_am_ldflags@ \ $(top_builddir)/storage/ndb/src/libndbclient.la \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la include $(top_srcdir)/storage/ndb/config/common.mk.am include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am diff -Nrup a/storage/ndb/src/kernel/blocks/dbdict/Makefile.am b/storage/ndb/src/kernel/blocks/dbdict/Makefile.am --- a/storage/ndb/src/kernel/blocks/dbdict/Makefile.am 2006-12-30 16:28:02 -08:00 +++ b/storage/ndb/src/kernel/blocks/dbdict/Makefile.am 2008-04-22 21:27:24 -07:00 @@ -19,17 +19,17 @@ include $(top_srcdir)/storage/ndb/config LDADD += \ $(top_builddir)/storage/ndb/src/common/util/libgeneral.la \ $(top_builddir)/storage/ndb/src/common/portlib/libportlib.la \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/strings/libmystrings.la ndbtools_PROGRAMS = ndb_print_schema_file ndb_print_schema_file_SOURCES = printSchemaFile.cpp ndb_print_schema_file_LDFLAGS = @ndb_bin_am_ldflags@ \ $(top_builddir)/storage/ndb/src/libndbclient.la \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/strings/libmystrings.la # Don't update the files from bitkeeper %::SCCS/s.% diff -Nrup a/storage/ndb/src/kernel/blocks/dbdih/Makefile.am b/storage/ndb/src/kernel/blocks/dbdih/Makefile.am --- a/storage/ndb/src/kernel/blocks/dbdih/Makefile.am 2006-12-30 16:29:35 -08:00 +++ b/storage/ndb/src/kernel/blocks/dbdih/Makefile.am 2008-04-22 21:27:24 -07:00 @@ -17,9 +17,9 @@ ndbtools_PROGRAMS = ndb_print_sys_file ndb_print_sys_file_SOURCES = printSysfile.cpp ndb_print_sys_file_LDFLAGS = @ndb_bin_am_ldflags@ \ $(top_builddir)/storage/ndb/src/libndbclient.la \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/strings/libmystrings.la include $(top_srcdir)/storage/ndb/config/common.mk.am diff -Nrup a/storage/ndb/src/kernel/blocks/dblqh/Makefile.am b/storage/ndb/src/kernel/blocks/dblqh/Makefile.am --- a/storage/ndb/src/kernel/blocks/dblqh/Makefile.am 2007-05-30 11:27:24 -07:00 +++ b/storage/ndb/src/kernel/blocks/dblqh/Makefile.am 2008-04-22 21:27:24 -07:00 @@ -23,9 +23,9 @@ include $(top_srcdir)/storage/ndb/config ndbd_redo_log_reader_LDFLAGS = @ndb_bin_am_ldflags@ \ $(top_builddir)/storage/ndb/src/libndbclient.la \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/strings/libmystrings.la # Don't update the files from bitkeeper %::SCCS/s.% diff -Nrup a/storage/ndb/src/kernel/blocks/dbtup/Makefile.am b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am --- a/storage/ndb/src/kernel/blocks/dbtup/Makefile.am 2006-12-30 16:32:00 -08:00 +++ b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am 2008-04-22 21:27:24 -07:00 @@ -20,9 +20,9 @@ EXTRA_PROGRAMS = test_varpage test_varpage_SOURCES = test_varpage.cpp tuppage.cpp test_varpage_LDFLAGS = @ndb_bin_am_ldflags@ \ $(top_builddir)/storage/ndb/src/libndbclient.la \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la # Don't update the files from bitkeeper %::SCCS/s.% diff -Nrup a/storage/ndb/src/kernel/vm/Makefile.am b/storage/ndb/src/kernel/vm/Makefile.am --- a/storage/ndb/src/kernel/vm/Makefile.am 2006-12-30 16:06:42 -08:00 +++ b/storage/ndb/src/kernel/vm/Makefile.am 2008-04-22 21:27:24 -07:00 @@ -65,24 +65,24 @@ ndbd_malloc_impl_test_CXXFLAGS = -DUNIT_ ndbd_malloc_impl_test_SOURCES = ndbd_malloc_impl.cpp ndbd_malloc_impl_test_LDFLAGS = @ndb_bin_am_ldflags@ \ $(top_builddir)/storage/ndb/src/libndbclient.la \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la bench_pool_SOURCES = bench_pool.cpp bench_pool_LDFLAGS = @ndb_bin_am_ldflags@\ libkernel.a ../error/liberror.a \ $(top_builddir)/storage/ndb/src/libndbclient.la \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la testDynArr256_CXXFLAGS = -DUNIT_TEST testDynArr256_SOURCES = DynArr256.cpp testDynArr256_LDFLAGS = @ndb_bin_am_ldflags@ \ libkernel.a ../error/liberror.a \ $(top_builddir)/storage/ndb/src/libndbclient.la \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la diff -Nrup a/storage/ndb/src/mgmclient/Makefile.am b/storage/ndb/src/mgmclient/Makefile.am --- a/storage/ndb/src/mgmclient/Makefile.am 2007-08-01 00:23:54 -07:00 +++ b/storage/ndb/src/mgmclient/Makefile.am 2008-04-22 21:27:24 -07:00 @@ -37,9 +37,9 @@ LDADD_LOC = $(noinst_LTLIBRARIES) \ ../common/portlib/libportlib.la \ @readline_link@ \ $(top_builddir)/storage/ndb/src/libndbclient.la \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/strings/libmystrings.la \ @TERMCAP_LIB@ @NDB_SCI_LIBS@ ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@ diff -Nrup a/storage/ndb/src/mgmsrv/Makefile.am b/storage/ndb/src/mgmsrv/Makefile.am --- a/storage/ndb/src/mgmsrv/Makefile.am 2007-07-31 20:07:26 -07:00 +++ b/storage/ndb/src/mgmsrv/Makefile.am 2008-04-22 21:27:25 -07:00 @@ -40,9 +40,9 @@ INCLUDES_LOC = -I$(top_srcdir)/storage/n LDADD_LOC = $(top_builddir)/storage/ndb/src/mgmclient/CommandInterpreter.lo \ $(top_builddir)/storage/ndb/src/libndbclient.la \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/strings/libmystrings.la \ @readline_link@ \ @NDB_SCI_LIBS@ \ @TERMCAP_LIB@ diff -Nrup a/storage/ndb/src/ndbapi/Makefile.am b/storage/ndb/src/ndbapi/Makefile.am --- a/storage/ndb/src/ndbapi/Makefile.am 2007-05-29 04:46:54 -07:00 +++ b/storage/ndb/src/ndbapi/Makefile.am 2008-04-22 21:27:25 -07:00 @@ -68,9 +68,10 @@ include $(top_srcdir)/storage/ndb/config include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am ndberror_check_LDFLAGS = \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/strings/libmystrings.la \ + $(top_builddir)/zlib/libzlt.la # Don't update the files from bitkeeper %::SCCS/s.% diff -Nrup a/storage/ndb/test/run-test/Makefile.am b/storage/ndb/test/run-test/Makefile.am --- a/storage/ndb/test/run-test/Makefile.am 2008-02-21 05:57:38 -08:00 +++ b/storage/ndb/test/run-test/Makefile.am 2008-04-22 21:27:25 -07:00 @@ -33,9 +33,9 @@ atrt_SOURCES = main.cpp setup.cpp files. INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/test/include LDADD_LOC = $(top_builddir)/storage/ndb/test/src/libNDBT.a \ $(top_builddir)/storage/ndb/src/libndbclient.la \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ \ $(top_builddir)/libmysql_r/libmysqlclient_r.la atrt_CXXFLAGS = -I$(top_srcdir)/ndb/src/mgmapi \ diff -Nrup a/strings/Makefile.am b/strings/Makefile.am --- a/strings/Makefile.am 2006-12-30 16:06:43 -08:00 +++ b/strings/Makefile.am 2008-04-22 21:27:25 -07:00 @@ -16,7 +16,7 @@ # This file is public domain and comes with NO WARRANTY of any kind INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -pkglib_LIBRARIES = libmystrings.a +noinst_LTLIBRARIES = libmystrings.la # Exact one of ASSEMBLER_X if ASSEMBLER_x86 @@ -37,7 +37,7 @@ CSRCS = strxmov.c bmove_upp.c strappend endif endif -libmystrings_a_SOURCES = $(ASRCS) $(CSRCS) +libmystrings_la_SOURCES = $(ASRCS) $(CSRCS) noinst_PROGRAMS = conf_to_src CLEANFILES = str_test uctypedump test_decimal # Default charset definitions @@ -55,9 +55,9 @@ EXTRA_DIST = ctype-big5.c ctype-cp932.c strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \ t_ctype.h my_strchr.c CMakeLists.txt -libmystrings_a_LIBADD= -conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c bcmp.c -conf_to_src_LDADD= +libmystrings_la_LIBADD= +conf_to_src_SOURCES = conf_to_src.c +conf_to_src_LDADD= libmystrings.la #force static linking of conf_to_src - essential when linking against #custom installation of libc conf_to_src_LDFLAGS= @NOINST_LDFLAGS@ @@ -68,15 +68,15 @@ conf_to_src_LDFLAGS= @NOINST_LDFLAGS@ FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@ -str_test: str_test.c $(pkglib_LIBRARIES) - $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LIBRARIES) +str_test: str_test.c $(noinst_LTLIBRARIES) + $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(noinst_LTLIBRARIES) uctypedump: uctypedump.c $(LINK) $(INCLUDES) $(srcdir)/uctypedump.c -test_decimal$(EXEEXT): decimal.c $(pkglib_LIBRARIES) +test_decimal$(EXEEXT): decimal.c $(noinst_LTLIBRARIES) $(CP) $(srcdir)/decimal.c ./test_decimal.c - $(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(pkglib_LIBRARIES) + $(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(noinst_LTLIBRARIES) $(RM) -f ./test_decimal.c # Don't update the files from bitkeeper diff -Nrup a/unittest/mysys/Makefile.am b/unittest/mysys/Makefile.am --- a/unittest/mysys/Makefile.am 2007-05-28 13:17:46 -07:00 +++ b/unittest/mysys/Makefile.am 2008-04-22 21:27:25 -07:00 @@ -17,9 +17,10 @@ AM_CPPFLAGS = @ZLIB_INCLUDES@ -I$(t AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap LDADD = $(top_builddir)/unittest/mytap/libmytap.a \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/mysys/libmysys.la \ + $(top_builddir)/dbug/libdbug.la \ + $(top_builddir)/strings/libmystrings.la \ + @M_LIBS@ @ZLIB_LIBS@ noinst_PROGRAMS = bitmap-t base64-t my_atomic-t
| Thread | ||
|---|---|---|
| • bk commit into 5.1 tree (mtaylor:1.2579) BUG#29791 | Monty Taylor | 23 Apr |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.857 sec. using MySQL 5.1.14-beta-log