Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent 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, 2006-12-21 02:46:53+01:00, kent@stripped +88 -0
Many Makefile.am:
Use libtool libraries, gives more flexibility and portability
ha_innodb.m4, innobase/Makefile.am:
Use libtool libraries, gives more flexibility and portability
Combine innobase libtool libraries to one library, and at the
same time resolve the circular library dependency.
libmysqld/Makefile.am:
Use libtool libraries, gives more flexibility and portability
Trust libtool to combine objects to build the embedded server lib
Some innobase C files:
Avoid symbol collision between libmysqld and other libraries (bug#13859)
client/Makefile.am@stripped, 2006-12-21 02:33:42+01:00, kent@stripped +1 -1
Use libtool libraries, gives more flexibility and portability
cmd-line-utils/libedit/Makefile.am@stripped, 2006-12-21 02:33:43+01:00, kent@stripped +5 -5
Use libtool libraries, gives more flexibility and portability
cmd-line-utils/readline/Makefile.am@stripped, 2006-12-21 02:33:43+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
config/ac-macros/ha_innodb.m4@stripped, 2006-12-21 02:39:37+01:00, kent@stripped +2 -39
Use libtool libraries, gives more flexibility and portability
Combine innobase libtool libraries to one library, and at the
same time resolve the circular library dependency.
config/ac-macros/ha_ndbcluster.m4@stripped, 2006-12-21 02:33:43+01:00, kent@stripped +1 -1
Use libtool libraries, gives more flexibility and portability
configure.in@stripped, 2006-12-21 02:34:32+01:00, kent@stripped +5 -6
Use libtool libraries, gives more flexibility and portability
dbug/Makefile.am@stripped, 2006-12-21 02:33:43+01:00, kent@stripped +4 -3
Use libtool libraries, gives more flexibility and portability
extra/Makefile.am@stripped, 2006-12-21 02:33:44+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
heap/Makefile.am@stripped, 2006-12-21 02:33:44+01:00, kent@stripped +5 -4
Use libtool libraries, gives more flexibility and portability
innobase/Makefile.am@stripped, 2006-12-21 02:40:31+01:00, kent@stripped +36 -1
Use libtool libraries, gives more flexibility and portability
Combine innobase libtool libraries to one library, and at the
same time resolve the circular library dependency.
innobase/btr/Makefile.am@stripped, 2006-12-21 02:11:42+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/buf/Makefile.am@stripped, 2006-12-21 02:11:42+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/buf/buf0buf.c@stripped, 2006-12-21 02:08:53+01:00, kent@stripped +1 -1
Avoid symbol collision between libmysqld and other libraries (bug#13859)
innobase/data/Makefile.am@stripped, 2006-12-21 02:11:43+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/dict/Makefile.am@stripped, 2006-12-21 02:11:43+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/dict/dict0dict.c@stripped, 2006-12-21 02:08:53+01:00, kent@stripped +3 -3
Avoid symbol collision between libmysqld and other libraries (bug#13859)
innobase/dyn/Makefile.am@stripped, 2006-12-21 02:11:43+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/eval/Makefile.am@stripped, 2006-12-21 02:11:43+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/fil/Makefile.am@stripped, 2006-12-21 02:11:43+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/fil/fil0fil.c@stripped, 2006-12-21 02:08:54+01:00, kent@stripped +2 -2
Avoid symbol collision between libmysqld and other libraries (bug#13859)
innobase/fsp/Makefile.am@stripped, 2006-12-21 02:11:44+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/fut/Makefile.am@stripped, 2006-12-21 02:11:44+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/ha/Makefile.am@stripped, 2006-12-21 02:11:44+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/ha/ha0ha.c@stripped, 2006-12-21 02:08:54+01:00, kent@stripped +1 -1
Avoid symbol collision between libmysqld and other libraries (bug#13859)
innobase/ha/hash0hash.c@stripped, 2006-12-21 02:08:54+01:00, kent@stripped +1 -1
Avoid symbol collision between libmysqld and other libraries (bug#13859)
innobase/ibuf/Makefile.am@stripped, 2006-12-21 02:11:44+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/include/hash0hash.h@stripped, 2006-12-21 02:08:54+01:00, kent@stripped +1 -1
Avoid symbol collision between libmysqld and other libraries (bug#13859)
innobase/lock/Makefile.am@stripped, 2006-12-21 02:11:45+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/lock/lock0lock.c@stripped, 2006-12-21 02:08:55+01:00, kent@stripped +1 -1
Avoid symbol collision between libmysqld and other libraries (bug#13859)
innobase/log/Makefile.am@stripped, 2006-12-21 02:11:45+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/log/log0recv.c@stripped, 2006-12-21 02:08:55+01:00, kent@stripped +2 -2
Avoid symbol collision between libmysqld and other libraries (bug#13859)
innobase/mach/Makefile.am@stripped, 2006-12-21 02:11:45+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/mem/Makefile.am@stripped, 2006-12-21 02:11:45+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/mtr/Makefile.am@stripped, 2006-12-21 02:11:45+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/os/Makefile.am@stripped, 2006-12-21 02:11:46+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/page/Makefile.am@stripped, 2006-12-21 02:11:46+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/pars/Makefile.am@stripped, 2006-12-21 02:11:46+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/que/Makefile.am@stripped, 2006-12-21 02:11:46+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/read/Makefile.am@stripped, 2006-12-21 02:11:47+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/rem/Makefile.am@stripped, 2006-12-21 02:11:47+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/row/Makefile.am@stripped, 2006-12-21 02:11:47+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/srv/Makefile.am@stripped, 2006-12-21 02:11:47+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/sync/Makefile.am@stripped, 2006-12-21 02:11:47+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/thr/Makefile.am@stripped, 2006-12-21 02:11:48+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/thr/thr0loc.c@stripped, 2006-12-21 02:08:55+01:00, kent@stripped +1 -1
Avoid symbol collision between libmysqld and other libraries (bug#13859)
innobase/trx/Makefile.am@stripped, 2006-12-21 02:11:48+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/usr/Makefile.am@stripped, 2006-12-21 02:11:48+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
innobase/ut/Makefile.am@stripped, 2006-12-21 02:11:48+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
libmysqld/Makefile.am@stripped, 2006-12-21 02:38:35+01:00, kent@stripped +30 -50
Use libtool libraries, gives more flexibility and portability
Trust libtool to combine objects to build the embedded server lib
libmysqld/examples/Makefile.am@stripped, 2006-12-21 02:36:02+01:00, kent@stripped +3 -2
Use libtool libraries, gives more flexibility and portability
Don't depend on explicit innodb library references
myisam/Makefile.am@stripped, 2006-12-21 02:33:44+01:00, kent@stripped +18 -17
Use libtool libraries, gives more flexibility and portability
myisammrg/Makefile.am@stripped, 2006-12-21 02:33:45+01:00, kent@stripped +3 -2
Use libtool libraries, gives more flexibility and portability
mysys/Makefile.am@stripped, 2006-12-21 02:34:32+01:00, kent@stripped +14 -8
Use libtool libraries, gives more flexibility and portability
ndb/config/type_ndbapitest.mk.am@stripped, 2006-12-21 02:33:45+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
ndb/config/type_ndbapitools.mk.am@stripped, 2006-12-21 02:33:45+01:00, kent@stripped +3 -3
Use libtool libraries, gives more flexibility and portability
ndb/src/common/util/Makefile.am@stripped, 2006-12-21 02:33:45+01:00, kent@stripped +3 -3
Use libtool libraries, gives more flexibility and portability
ndb/src/cw/cpcd/Makefile.am@stripped, 2006-12-21 02:33:46+01:00, kent@stripped +3 -3
Use libtool libraries, gives more flexibility and portability
ndb/src/kernel/Makefile.am@stripped, 2006-12-21 02:33:46+01:00, kent@stripped +20 -20
Use libtool libraries, gives more flexibility and portability
ndb/src/kernel/blocks/backup/Makefile.am@stripped, 2006-12-21 02:33:46+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
ndb/src/kernel/blocks/cmvmi/Makefile.am@stripped, 2006-12-21 02:33:47+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
ndb/src/kernel/blocks/dbacc/Makefile.am@stripped, 2006-12-21 02:33:47+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
ndb/src/kernel/blocks/dbdict/Makefile.am@stripped, 2006-12-21 02:33:47+01:00, kent@stripped +7 -7
Use libtool libraries, gives more flexibility and portability
ndb/src/kernel/blocks/dbdih/Makefile.am@stripped, 2006-12-21 02:33:47+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
ndb/src/kernel/blocks/dblqh/Makefile.am@stripped, 2006-12-21 02:33:47+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
ndb/src/kernel/blocks/dbtc/Makefile.am@stripped, 2006-12-21 02:33:48+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
ndb/src/kernel/blocks/dbtup/Makefile.am@stripped, 2006-12-21 02:33:48+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
ndb/src/kernel/blocks/dbtux/Makefile.am@stripped, 2006-12-21 02:33:48+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
ndb/src/kernel/blocks/dbutil/Makefile.am@stripped, 2006-12-21 02:33:48+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
ndb/src/kernel/blocks/ndbcntr/Makefile.am@stripped, 2006-12-21 02:33:49+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
ndb/src/kernel/blocks/ndbfs/Makefile.am@stripped, 2006-12-21 02:33:49+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
ndb/src/kernel/blocks/qmgr/Makefile.am@stripped, 2006-12-21 02:33:49+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
ndb/src/kernel/blocks/suma/Makefile.am@stripped, 2006-12-21 02:33:49+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
ndb/src/kernel/blocks/trix/Makefile.am@stripped, 2006-12-21 02:33:50+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
ndb/src/kernel/error/Makefile.am@stripped, 2006-12-21 02:33:50+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
ndb/src/kernel/vm/Makefile.am@stripped, 2006-12-21 02:33:50+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
ndb/src/mgmclient/Makefile.am@stripped, 2006-12-21 02:33:50+01:00, kent@stripped +3 -3
Use libtool libraries, gives more flexibility and portability
ndb/src/mgmsrv/Makefile.am@stripped, 2006-12-21 02:33:51+01:00, kent@stripped +3 -3
Use libtool libraries, gives more flexibility and portability
ndb/test/ndbapi/Makefile.am@stripped, 2006-12-21 02:33:51+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
ndb/test/ndbapi/bank/Makefile.am@stripped, 2006-12-21 02:33:51+01:00, kent@stripped +3 -3
Use libtool libraries, gives more flexibility and portability
ndb/test/run-test/Makefile.am@stripped, 2006-12-21 02:33:51+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
ndb/test/src/Makefile.am@stripped, 2006-12-21 02:33:51+01:00, kent@stripped +4 -4
Use libtool libraries, gives more flexibility and portability
netware/Makefile.am@stripped, 2006-12-21 02:33:52+01:00, kent@stripped +3 -3
Use libtool libraries, gives more flexibility and portability
pstack/Makefile.am@stripped, 2006-12-21 02:33:52+01:00, kent@stripped +2 -2
Use libtool libraries, gives more flexibility and portability
regex/Makefile.am@stripped, 2006-12-21 02:33:52+01:00, kent@stripped +3 -3
Use libtool libraries, gives more flexibility and portability
server-tools/instance-manager/Makefile.am@stripped, 2006-12-21 02:33:53+01:00, kent@stripped +12 -13
Use libtool libraries, gives more flexibility and portability
sql/Makefile.am@stripped, 2006-12-21 02:33:53+01:00, kent@stripped +11 -12
Use libtool libraries, gives more flexibility and portability
strings/Makefile.am@stripped, 2006-12-21 02:33:53+01:00, kent@stripped +10 -9
Use libtool libraries, gives more flexibility and portability
vio/Makefile.am@stripped, 2006-12-21 02:33:53+01:00, kent@stripped +3 -2
Use libtool libraries, gives more flexibility and portability
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: kent
# Host: c-5b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root: /Users/kent/mysql/bk/mysql-5.0-ltlibs
--- 1.61/client/Makefile.am 2006-12-21 02:47:54 +01:00
+++ 1.62/client/Makefile.am 2006-12-21 02:47:54 +01:00
@@ -37,7 +37,7 @@
$(top_srcdir)/mysys/my_getsystime.c \
$(top_srcdir)/mysys/my_copy.c
-mysqltest_LDADD = $(top_builddir)/regex/libregex.a $(LDADD)
+mysqltest_LDADD = $(top_builddir)/regex/libregex.la $(LDADD)
mysqlbinlog_SOURCES = mysqlbinlog.cc \
$(top_srcdir)/mysys/mf_tempdir.c \
$(top_srcdir)/mysys/my_new.cc
--- 1.412/configure.in 2006-12-21 02:47:54 +01:00
+++ 1.413/configure.in 2006-12-21 02:47:54 +01:00
@@ -879,7 +879,7 @@
if test x"$have_libiberty" = xyes -a x"$have_libbfd" = xyes
then
pstack_dirs='$(top_srcdir)'/pstack
- pstack_libs="../pstack/libpstack.a -lbfd -liberty"
+ pstack_libs="../pstack/libpstack.la -lbfd -liberty"
# We must link staticly when using pstack
with_mysqld_ldflags="-all-static"
AC_SUBST([pstack_dirs])
@@ -2433,7 +2433,7 @@
readline_topdir="cmd-line-utils"
readline_basedir="libedit"
readline_dir="$readline_topdir/$readline_basedir"
- readline_link="\$(top_builddir)/cmd-line-utils/libedit/libedit.a"
+ readline_link="\$(top_builddir)/cmd-line-utils/libedit/libedit.la"
readline_h_ln_cmd="\$(LN) -s \$(top_srcdir)/cmd-line-utils/libedit/readline readline"
compile_libedit=yes
AC_DEFINE_UNQUOTED(HAVE_HIST_ENTRY, 1)
@@ -2443,7 +2443,7 @@
readline_topdir="cmd-line-utils"
readline_basedir="readline"
readline_dir="$readline_topdir/$readline_basedir"
- readline_link="\$(top_builddir)/cmd-line-utils/readline/libreadline.a"
+ readline_link="\$(top_builddir)/cmd-line-utils/readline/libreadline.la"
readline_h_ln_cmd="\$(LN) -s \$(top_srcdir)/cmd-line-utils/readline readline"
compile_readline=yes
AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1)
@@ -2532,9 +2532,6 @@
then
AC_DEFINE([THREAD], [1],
[Define if you want to have threaded code. This may be undef on client code])
- # Avoid _PROGRAMS names
- THREAD_LOBJECTS="thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my_pthread.o my_thr_init.o mf_keycache.o"
- AC_SUBST(THREAD_LOBJECTS)
server_scripts="mysqld_safe mysql_install_db"
sql_server_dirs="strings mysys dbug extra regex"
@@ -2645,6 +2642,8 @@
#
sql_server_dirs="$sql_server_dirs myisam myisammrg heap vio sql"
fi
+
+AM_CONDITIONAL(HAVE_THREAD_SAFE_CLIENT, test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no")
# IMPORTANT - do not modify LIBS past this line - this hack is the only way
# I know to add the static NSS magic if we have static NSS libraries with
--- 1.15/dbug/Makefile.am 2006-12-21 02:47:54 +01:00
+++ 1.16/dbug/Makefile.am 2006-12-21 02:47:54 +01:00
@@ -16,10 +16,11 @@
# 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
+pkglib_LTLIBRARIES = libdbug.la
noinst_HEADERS = dbug_long.h
-libdbug_a_SOURCES = dbug.c sanity.c
+libdbug_la_SOURCES = dbug.c sanity.c
+libdbug_la_LDFLAGS = -static
EXTRA_DIST = example1.c example2.c example3.c \
user.r monty.doc readme.prof dbug_add_tags.pl \
my_main.c main.c factorial.c dbug_analyze.c \
--- 1.35/extra/Makefile.am 2006-12-21 02:47:54 +01:00
+++ 1.36/extra/Makefile.am 2006-12-21 02:47:54 +01:00
@@ -16,8 +16,8 @@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
@ndbcluster_includes@ -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
BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \
$(top_builddir)/include/sql_state.h \
$(top_builddir)/include/mysqld_ername.h
--- 1.11/heap/Makefile.am 2006-12-21 02:47:54 +01:00
+++ 1.12/heap/Makefile.am 2006-12-21 02:47:54 +01:00
@@ -15,19 +15,20 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
-LDADD = libheap.a ../mysys/libmysys.a ../dbug/libdbug.a \
- ../strings/libmystrings.a
-pkglib_LIBRARIES = libheap.a
+LDADD = libheap.la ../mysys/libmysys.la ../dbug/libdbug.la \
+ ../strings/libmystrings.la
+pkglib_LTLIBRARIES = libheap.la
noinst_PROGRAMS = hp_test1 hp_test2
hp_test1_LDFLAGS = @NOINST_LDFLAGS@
hp_test2_LDFLAGS = @NOINST_LDFLAGS@
noinst_HEADERS = heapdef.h
-libheap_a_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \
+libheap_la_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 \
hp_rsame.c hp_create.c hp_rename.c hp_rfirst.c \
hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \
hp_rkey.c hp_block.c \
hp_hash.c _check.c _rectest.c hp_static.c
+libheap_la_LDFLAGS = -static
EXTRA_DIST = CMakeLists.txt
# Don't update the files from bitkeeper
%::SCCS/s.%
--- 1.32/myisam/Makefile.am 2006-12-21 02:47:55 +01:00
+++ 1.33/myisam/Makefile.am 2006-12-21 02:47:55 +01:00
@@ -18,26 +18,26 @@
pkgdata_DATA = mi_test_all mi_test_all.res
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
-LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-pkglib_LIBRARIES = libmyisam.a
+LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
+pkglib_LTLIBRARIES = libmyisam.la
bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump
-myisamchk_DEPENDENCIES= $(LIBRARIES)
-myisamlog_DEPENDENCIES= $(LIBRARIES)
-myisampack_DEPENDENCIES=$(LIBRARIES)
+myisamchk_DEPENDENCIES= $(LTLIBRARIES)
+myisamlog_DEPENDENCIES= $(LTLIBRARIES)
+myisampack_DEPENDENCIES=$(LTLIBRARIES)
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
-mi_test1_DEPENDENCIES= $(LIBRARIES)
-mi_test2_DEPENDENCIES= $(LIBRARIES)
-mi_test3_DEPENDENCIES= $(LIBRARIES)
-#ft_test1_DEPENDENCIES= $(LIBRARIES)
-#ft_eval_DEPENDENCIES= $(LIBRARIES)
-myisam_ftdump_DEPENDENCIES= $(LIBRARIES)
-rt_test_DEPENDENCIES= $(LIBRARIES)
-sp_test_DEPENDENCIES= $(LIBRARIES)
-libmyisam_a_SOURCES = mi_open.c mi_extra.c mi_info.c mi_rkey.c \
+mi_test1_DEPENDENCIES= $(LTLIBRARIES)
+mi_test2_DEPENDENCIES= $(LTLIBRARIES)
+mi_test3_DEPENDENCIES= $(LTLIBRARIES)
+#ft_test1_DEPENDENCIES= $(LTLIBRARIES)
+#ft_eval_DEPENDENCIES= $(LTLIBRARIES)
+myisam_ftdump_DEPENDENCIES= $(LTLIBRARIES)
+rt_test_DEPENDENCIES= $(LTLIBRARIES)
+sp_test_DEPENDENCIES= $(LTLIBRARIES)
+libmyisam_la_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 \
mi_rrnd.c mi_scan.c mi_cache.c \
@@ -53,6 +53,7 @@
ft_parser.c ft_stopwords.c ft_static.c \
ft_update.c ft_boolean_search.c ft_nlq_search.c sort.c \
rt_index.c rt_key.c rt_mbr.c rt_split.c sp_key.c
+libmyisam_la_LDFLAGS = -static
CLEANFILES = test?.MY? FT?.MY? isam.log mi_test_all rt_test.MY? sp_test.MY?
DEFS = -DMAP_TO_USE_RAID
--- 1.15/myisammrg/Makefile.am 2006-12-21 02:47:55 +01:00
+++ 1.16/myisammrg/Makefile.am 2006-12-21 02:47:55 +01:00
@@ -15,14 +15,15 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
-pkglib_LIBRARIES = libmyisammrg.a
+pkglib_LTLIBRARIES = libmyisammrg.la
noinst_HEADERS = myrg_def.h
-libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
+libmyisammrg_la_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
myrg_rrnd.c myrg_update.c myrg_delete.c myrg_rsame.c \
myrg_panic.c myrg_close.c myrg_create.c myrg_static.c \
myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \
myrg_rprev.c myrg_queue.c myrg_write.c myrg_range.c \
myrg_rnext_same.c
+libmyisammrg_la_LDFLAGS = -static
EXTRA_DIST = CMakeLists.txt
# Don't update the files from bitkeeper
%::SCCS/s.%
--- 1.72/mysys/Makefile.am 2006-12-21 02:47:55 +01:00
+++ 1.73/mysys/Makefile.am 2006-12-21 02:47:55 +01:00
@@ -19,14 +19,14 @@
MYSQLBASEdir= $(prefix)
INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
-I$(top_srcdir)/include -I$(srcdir)
-pkglib_LIBRARIES = libmysys.a
-LDADD = libmysys.a ../dbug/libdbug.a \
- ../strings/libmystrings.a
+pkglib_LTLIBRARIES = libmysys.la
+LDADD = libmysys.la ../dbug/libdbug.la \
+ ../strings/libmystrings.la
noinst_HEADERS = mysys_priv.h my_static.h \
my_os2cond.c my_os2dirsrch.c my_os2dirsrch.h \
my_os2dlfcn.c my_os2file64.c my_os2mutex.c \
my_os2thread.c my_os2tls.c
-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 \
@@ -56,11 +56,19 @@
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
+ my_windac.c my_access.c base64.c my_libwrap.c $(THREAD_SRC)
+libmysys_la_LDFLAGS = -static
+libmysys_la_LIBADD = $(top_builddir)/strings/libmystrings.la
+if HAVE_THREAD_SAFE_CLIENT
+THREAD_SRC = thr_alarm.c thr_lock.c thr_mutex.c thr_rwlock.c \
+ my_pthread.c my_thr_init.c
+else
+THREAD_SRC =
+endif
+# Duplicate some in THREAD_SRC, just to ensure always in dist
EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
thr_mutex.c thr_rwlock.c mf_soundex.c my_conio.c \
my_wincond.c my_winsem.c my_winthread.c CMakeLists.txt
-libmysys_a_LIBADD = @THREAD_LOBJECTS@
# test_dir_DEPENDENCIES= $(LIBRARIES)
# testhash_DEPENDENCIES= $(LIBRARIES)
# test_charset_DEPENDENCIES= $(LIBRARIES)
@@ -74,8 +82,6 @@
-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
@DEFS@
-
-libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@
# I hope this always does the right thing. Otherwise this is only test programs
FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
--- 1.15/cmd-line-utils/readline/Makefile.am 2006-12-21 02:47:55 +01:00
+++ 1.16/cmd-line-utils/readline/Makefile.am 2006-12-21 02:47:55 +01:00
@@ -6,9 +6,9 @@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_srcdir)
-noinst_LIBRARIES = libreadline.a
+noinst_LTLIBRARIES = libreadline.la
-libreadline_a_SOURCES = readline.c funmap.c keymaps.c \
+libreadline_la_SOURCES =readline.c funmap.c keymaps.c \
vi_mode.c parens.c rltty.c \
complete.c bind.c isearch.c \
display.c signals.c \
--- 1.15/regex/Makefile.am 2006-12-21 02:47:55 +01:00
+++ 1.16/regex/Makefile.am 2006-12-21 02:47:55 +01:00
@@ -16,10 +16,10 @@
# MA 02111-1307, USA
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
-noinst_LIBRARIES = libregex.a
-LDADD= libregex.a $(top_builddir)/strings/libmystrings.a
+noinst_LTLIBRARIES = libregex.la
+LDADD= libregex.la $(top_builddir)/strings/libmystrings.la
noinst_HEADERS = cclass.h cname.h regex2.h utils.h engine.c my_regex.h
-libregex_a_SOURCES = regerror.c regcomp.c regexec.c regfree.c reginit.c
+libregex_la_SOURCES = regerror.c regcomp.c regexec.c regfree.c reginit.c
noinst_PROGRAMS = re
re_SOURCES = split.c debug.c main.c
re_LDFLAGS= @NOINST_LDFLAGS@
--- 1.128/sql/Makefile.am 2006-12-21 02:47:55 +01:00
+++ 1.129/sql/Makefile.am 2006-12-21 02:47:55 +01:00
@@ -30,21 +30,20 @@
EXTRA_PROGRAMS = gen_lex_hash
bin_PROGRAMS = mysql_tzinfo_to_sql
gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@
-LDADD = $(top_builddir)/myisam/libmyisam.a \
- $(top_builddir)/myisammrg/libmyisammrg.a \
- $(top_builddir)/heap/libheap.a \
- $(top_builddir)/vio/libvio.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/regex/libregex.a \
- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ @NDB_SCI_LIBS@
-
+LDADD = $(top_builddir)/myisam/libmyisam.la \
+ $(top_builddir)/myisammrg/libmyisammrg.la \
+ $(top_builddir)/heap/libheap.la \
+ $(top_builddir)/vio/libvio.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/regex/libregex.la \
+ $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@ @NDB_SCI_LIBS@
mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
- @bdb_libs@ @innodb_libs@ @pstack_libs@ \
- @innodb_system_libs@ \
+ @bdb_libs@ @pstack_libs@ \
+ @innodb_libs@ @innodb_system_libs@ \
@ndbcluster_libs@ @ndbcluster_system_libs@ \
$(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
- @yassl_libs@ @openssl_libs@
+ @yassl_libs@ @openssl_libs@
noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
item_strfunc.h item_timefunc.h item_uniq.h \
item_create.h item_subselect.h item_row.h \
--- 1.51/strings/Makefile.am 2006-12-21 02:47:55 +01:00
+++ 1.52/strings/Makefile.am 2006-12-21 02:47:55 +01:00
@@ -17,7 +17,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
+pkglib_LTLIBRARIES = libmystrings.la
# Exact one of ASSEMBLER_X
if ASSEMBLER_x86
@@ -38,7 +38,7 @@
endif
endif
-libmystrings_a_SOURCES = $(ASRCS) $(CSRCS)
+libmystrings_la_SOURCES = $(ASRCS) $(CSRCS)
noinst_PROGRAMS = conf_to_src
# Default charset definitions
EXTRA_DIST = ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc_kr.c ctype-win1250ch.c \
@@ -54,10 +54,11 @@
strinstr-sparc.s strmake-sparc.s strmov-sparc.s \
strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \
t_ctype.h CMakeLists.txt
+libmystrings_la_LDFLAGS = -static
+libmystrings_la_LIBADD=
-libmystrings_a_LIBADD=
-conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c bcmp.c
-conf_to_src_LDADD=
+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,12 +69,12 @@
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 $(pkglib_LTLIBRARIES)
+ $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LTLIBRARIES)
-test_decimal$(EXEEXT): decimal.c $(pkglib_LIBRARIES)
+test_decimal$(EXEEXT): decimal.c $(pkglib_LTLIBRARIES)
$(CP) $(srcdir)/decimal.c ./test_decimal.c
- $(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(pkglib_LIBRARIES)
+ $(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(pkglib_LTLIBRARIES)
$(RM) -f ./test_decimal.c
# Don't update the files from bitkeeper
--- 1.20/vio/Makefile.am 2006-12-21 02:47:55 +01:00
+++ 1.21/vio/Makefile.am 2006-12-21 02:47:55 +01:00
@@ -17,11 +17,12 @@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
$(openssl_includes)
LDADD = @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs)
-pkglib_LIBRARIES = libvio.a
+pkglib_LTLIBRARIES = libvio.la
noinst_HEADERS = vio_priv.h
-libvio_a_SOURCES = vio.c viosocket.c viossl.c viosslfactories.c
+libvio_la_SOURCES = vio.c viosocket.c viossl.c viosslfactories.c
+libvio_la_LDFLAGS = -static
EXTRA_DIST= CMakeLists.txt
--- 1.3/config/ac-macros/ha_innodb.m4 2006-12-21 02:47:55 +01:00
+++ 1.4/config/ac-macros/ha_innodb.m4 2006-12-21 02:47:55 +01:00
@@ -15,51 +15,14 @@
have_innodb=no
innodb_includes=
innodb_libs=
+ innodb_system_libs=
case "$innodb" in
yes )
AC_MSG_RESULT([Using Innodb])
AC_DEFINE([HAVE_INNOBASE_DB], [1], [Using Innobase DB])
have_innodb="yes"
innodb_includes="-I\$(top_builddir)/innobase/include -I\$(top_srcdir)/innobase/include"
- innodb_system_libs=""
-dnl Some libs are listed several times, in order for gcc to sort out
-dnl circular references.
- innodb_libs="\
- \$(top_builddir)/innobase/usr/libusr.a\
- \$(top_builddir)/innobase/srv/libsrv.a\
- \$(top_builddir)/innobase/dict/libdict.a\
- \$(top_builddir)/innobase/que/libque.a\
- \$(top_builddir)/innobase/srv/libsrv.a\
- \$(top_builddir)/innobase/ibuf/libibuf.a\
- \$(top_builddir)/innobase/row/librow.a\
- \$(top_builddir)/innobase/pars/libpars.a\
- \$(top_builddir)/innobase/btr/libbtr.a\
- \$(top_builddir)/innobase/trx/libtrx.a\
- \$(top_builddir)/innobase/read/libread.a\
- \$(top_builddir)/innobase/usr/libusr.a\
- \$(top_builddir)/innobase/buf/libbuf.a\
- \$(top_builddir)/innobase/ibuf/libibuf.a\
- \$(top_builddir)/innobase/eval/libeval.a\
- \$(top_builddir)/innobase/log/liblog.a\
- \$(top_builddir)/innobase/fsp/libfsp.a\
- \$(top_builddir)/innobase/fut/libfut.a\
- \$(top_builddir)/innobase/fil/libfil.a\
- \$(top_builddir)/innobase/lock/liblock.a\
- \$(top_builddir)/innobase/mtr/libmtr.a\
- \$(top_builddir)/innobase/page/libpage.a\
- \$(top_builddir)/innobase/rem/librem.a\
- \$(top_builddir)/innobase/thr/libthr.a\
- \$(top_builddir)/innobase/sync/libsync.a\
- \$(top_builddir)/innobase/data/libdata.a\
- \$(top_builddir)/innobase/mach/libmach.a\
- \$(top_builddir)/innobase/ha/libha.a\
- \$(top_builddir)/innobase/dyn/libdyn.a\
- \$(top_builddir)/innobase/mem/libmem.a\
- \$(top_builddir)/innobase/sync/libsync.a\
- \$(top_builddir)/innobase/ut/libut.a\
- \$(top_builddir)/innobase/os/libos.a\
- \$(top_builddir)/innobase/ut/libut.a"
-
+ innodb_libs="\$(top_builddir)/innobase/libinnodb.la"
AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
;;
* )
--- 1.8/config/ac-macros/ha_ndbcluster.m4 2006-12-21 02:47:55 +01:00
+++ 1.9/config/ac-macros/ha_ndbcluster.m4 2006-12-21 02:47:55 +01:00
@@ -141,7 +141,7 @@
AC_DEFINE([HAVE_NDBCLUSTER_DB], [1], [Using Ndb Cluster DB])
have_ndbcluster="yes"
ndbcluster_includes="-I\$(top_builddir)/ndb/include -I\$(top_srcdir)/ndb/include -I\$(top_srcdir)/ndb/include/ndbapi -I\$(top_srcdir)/ndb/include/mgmapi"
- ndbcluster_libs="\$(top_builddir)/ndb/src/.libs/libndbclient.a"
+ ndbcluster_libs="\$(top_builddir)/ndb/src/libndbclient.la"
ndbcluster_system_libs=""
ndb_mgmclient_libs="\$(top_builddir)/ndb/src/mgmclient/libndbmgmclient.la"
MYSQL_CHECK_NDB_OPTIONS
--- 1.33/server-tools/instance-manager/Makefile.am 2006-12-21 02:47:55 +01:00
+++ 1.34/server-tools/instance-manager/Makefile.am 2006-12-21 02:47:55 +01:00
@@ -25,8 +25,7 @@
# default_options.h, generated from default_options.h.in)
# See automake/autoconf docs for details
-noinst_LTLIBRARIES= liboptions.la
-noinst_LIBRARIES= libnet.a
+noinst_LTLIBRARIES= liboptions.la libnet.la
liboptions_la_CXXFLAGS= $(CXXFLAGS) \
-DDEFAULT_PID_FILE_NAME="$(localstatedir)/mysqlmanager.pid" \
@@ -43,12 +42,12 @@
# MySQL sometimes uses symlinks to reuse code
# All symlinked files are grouped in libnet.a
-nodist_libnet_a_SOURCES= net_serv.cc client_settings.h
-libnet_a_LIBADD= $(top_builddir)/sql/password.$(OBJEXT) \
- $(top_builddir)/sql/pack.$(OBJEXT) \
- $(top_builddir)/sql/sql_state.$(OBJEXT) \
- $(top_builddir)/sql/mini_client_errors.$(OBJEXT)\
- $(top_builddir)/sql/client.$(OBJEXT)
+nodist_libnet_la_SOURCES= net_serv.cc client_settings.h \
+ $(top_builddir)/sql/password.c \
+ $(top_builddir)/sql/pack.c \
+ $(top_builddir)/sql/sql_state.c \
+ $(top_builddir)/sql/mini_client_errors.c \
+ $(top_builddir)/sql/client.c
CLEANFILES= net_serv.cc client_settings.h
@@ -80,11 +79,11 @@
portability.h
mysqlmanager_LDADD= liboptions.la \
- libnet.a \
- $(top_builddir)/vio/libvio.a \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/strings/libmystrings.a \
- $(top_builddir)/dbug/libdbug.a \
+ libnet.la \
+ $(top_builddir)/vio/libvio.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/strings/libmystrings.la \
+ $(top_builddir)/dbug/libdbug.la \
@openssl_libs@ @yassl_libs@ @ZLIB_LIBS@
--- 1.7/innobase/Makefile.am 2006-12-21 02:47:55 +01:00
+++ 1.8/innobase/Makefile.am 2006-12-21 02:47:55 +01:00
@@ -18,14 +18,49 @@
# Process this file with automake to create Makefile.in
AUTOMAKE_OPTIONS = foreign
-TAR = gtar
noinst_HEADERS = ib_config.h
SUBDIRS = os ut btr buf data dict dyn eval fil fsp fut \
ha ibuf include lock log mach mem mtr page \
pars que read rem row srv sync thr trx usr
+
EXTRA_DIST = CMakeLists.txt
+
+# Work around the circular dependency problem in innodb libs,
+# we create one lib from all the other libs
+noinst_LTLIBRARIES = libinnodb.la
+libinnodb_la_SOURCES =
+libinnodb_la_LIBADD = \
+ btr/libbtr.la \
+ buf/libbuf.la \
+ data/libdata.la \
+ dict/libdict.la \
+ dyn/libdyn.la \
+ eval/libeval.la \
+ fil/libfil.la \
+ fsp/libfsp.la \
+ fut/libfut.la \
+ ha/libha.la \
+ ibuf/libibuf.la \
+ lock/liblock.la \
+ log/liblog.la \
+ mach/libmach.la \
+ mem/libmem.la \
+ mtr/libmtr.la \
+ os/libos.la \
+ page/libpage.la \
+ pars/libpars.la \
+ que/libque.la \
+ read/libread.la \
+ rem/librem.la \
+ row/librow.la \
+ srv/libsrv.la \
+ sync/libsync.la \
+ thr/libthr.la \
+ trx/libtrx.la \
+ usr/libusr.la \
+ ut/libut.la
# Don't update the files from bitkeeper
%::SCCS/s.%
--- 1.3/innobase/btr/Makefile.am 2006-12-21 02:47:55 +01:00
+++ 1.4/innobase/btr/Makefile.am 2006-12-21 02:47:55 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libbtr.a
+noinst_LTLIBRARIES = libbtr.la
-libbtr_a_SOURCES = btr0btr.c btr0cur.c btr0pcur.c btr0sea.c
+libbtr_la_SOURCES = btr0btr.c btr0cur.c btr0pcur.c btr0sea.c
EXTRA_PROGRAMS =
--- 1.2/innobase/buf/Makefile.am 2006-12-21 02:47:55 +01:00
+++ 1.3/innobase/buf/Makefile.am 2006-12-21 02:47:55 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libbuf.a
+noinst_LTLIBRARIES = libbuf.la
-libbuf_a_SOURCES = buf0buf.c buf0flu.c buf0lru.c buf0rea.c
+libbuf_la_SOURCES = buf0buf.c buf0flu.c buf0lru.c buf0rea.c
EXTRA_PROGRAMS =
--- 1.54/innobase/buf/buf0buf.c 2006-12-21 02:47:55 +01:00
+++ 1.55/innobase/buf/buf0buf.c 2006-12-21 02:47:55 +01:00
@@ -649,7 +649,7 @@
}
}
- buf_pool->page_hash = hash_create(2 * max_size);
+ buf_pool->page_hash = hash0_create(2 * max_size);
buf_pool->n_pend_reads = 0;
--- 1.3/innobase/data/Makefile.am 2006-12-21 02:47:55 +01:00
+++ 1.4/innobase/data/Makefile.am 2006-12-21 02:47:55 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libdata.a
+noinst_LTLIBRARIES = libdata.la
-libdata_a_SOURCES = data0data.c data0type.c
+libdata_la_SOURCES = data0data.c data0type.c
EXTRA_PROGRAMS =
--- 1.2/innobase/dict/Makefile.am 2006-12-21 02:47:55 +01:00
+++ 1.3/innobase/dict/Makefile.am 2006-12-21 02:47:55 +01:00
@@ -17,9 +17,9 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libdict.a
+noinst_LTLIBRARIES = libdict.la
-libdict_a_SOURCES = dict0boot.c dict0crea.c dict0dict.c dict0load.c\
+libdict_la_SOURCES = dict0boot.c dict0crea.c dict0dict.c dict0load.c\
dict0mem.c
EXTRA_PROGRAMS =
--- 1.76/innobase/dict/dict0dict.c 2006-12-21 02:47:56 +01:00
+++ 1.77/innobase/dict/dict0dict.c 2006-12-21 02:47:56 +01:00
@@ -705,13 +705,13 @@
mutex_create(&(dict_sys->mutex));
mutex_set_level(&(dict_sys->mutex), SYNC_DICT);
- dict_sys->table_hash = hash_create(buf_pool_get_max_size() /
+ dict_sys->table_hash = hash0_create(buf_pool_get_max_size() /
(DICT_POOL_PER_TABLE_HASH *
UNIV_WORD_SIZE));
- dict_sys->table_id_hash = hash_create(buf_pool_get_max_size() /
+ dict_sys->table_id_hash = hash0_create(buf_pool_get_max_size() /
(DICT_POOL_PER_TABLE_HASH *
UNIV_WORD_SIZE));
- dict_sys->col_hash = hash_create(buf_pool_get_max_size() /
+ dict_sys->col_hash = hash0_create(buf_pool_get_max_size() /
(DICT_POOL_PER_COL_HASH *
UNIV_WORD_SIZE));
dict_sys->size = 0;
--- 1.2/innobase/dyn/Makefile.am 2006-12-21 02:47:56 +01:00
+++ 1.3/innobase/dyn/Makefile.am 2006-12-21 02:47:56 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libdyn.a
+noinst_LTLIBRARIES = libdyn.la
-libdyn_a_SOURCES = dyn0dyn.c
+libdyn_la_SOURCES = dyn0dyn.c
EXTRA_PROGRAMS =
--- 1.3/innobase/eval/Makefile.am 2006-12-21 02:47:56 +01:00
+++ 1.4/innobase/eval/Makefile.am 2006-12-21 02:47:56 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libeval.a
+noinst_LTLIBRARIES = libeval.la
-libeval_a_SOURCES = eval0eval.c eval0proc.c
+libeval_la_SOURCES = eval0eval.c eval0proc.c
EXTRA_PROGRAMS =
--- 1.2/innobase/fil/Makefile.am 2006-12-21 02:47:56 +01:00
+++ 1.3/innobase/fil/Makefile.am 2006-12-21 02:47:56 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libfil.a
+noinst_LTLIBRARIES = libfil.la
-libfil_a_SOURCES = fil0fil.c
+libfil_la_SOURCES = fil0fil.c
EXTRA_PROGRAMS =
--- 1.68/innobase/fil/fil0fil.c 2006-12-21 02:47:56 +01:00
+++ 1.69/innobase/fil/fil0fil.c 2006-12-21 02:47:56 +01:00
@@ -1294,8 +1294,8 @@
mutex_set_level(&(system->mutex), SYNC_ANY_LATCH);
- system->spaces = hash_create(hash_size);
- system->name_hash = hash_create(hash_size);
+ system->spaces = hash0_create(hash_size);
+ system->name_hash = hash0_create(hash_size);
UT_LIST_INIT(system->LRU);
--- 1.2/innobase/fsp/Makefile.am 2006-12-21 02:47:56 +01:00
+++ 1.3/innobase/fsp/Makefile.am 2006-12-21 02:47:56 +01:00
@@ -18,8 +18,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libfsp.a
+noinst_LTLIBRARIES = libfsp.la
-libfsp_a_SOURCES = fsp0fsp.c
+libfsp_la_SOURCES = fsp0fsp.c
EXTRA_PROGRAMS =
--- 1.2/innobase/fut/Makefile.am 2006-12-21 02:47:57 +01:00
+++ 1.3/innobase/fut/Makefile.am 2006-12-21 02:47:57 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libfut.a
+noinst_LTLIBRARIES = libfut.la
-libfut_a_SOURCES = fut0fut.c fut0lst.c
+libfut_la_SOURCES = fut0fut.c fut0lst.c
EXTRA_PROGRAMS =
--- 1.2/innobase/ha/Makefile.am 2006-12-21 02:47:57 +01:00
+++ 1.3/innobase/ha/Makefile.am 2006-12-21 02:47:57 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libha.a
+noinst_LTLIBRARIES = libha.la
-libha_a_SOURCES = ha0ha.c hash0hash.c
+libha_la_SOURCES = ha0ha.c hash0hash.c
EXTRA_PROGRAMS =
--- 1.16/innobase/ha/ha0ha.c 2006-12-21 02:47:57 +01:00
+++ 1.17/innobase/ha/ha0ha.c 2006-12-21 02:47:57 +01:00
@@ -32,7 +32,7 @@
hash_table_t* table;
ulint i;
- table = hash_create(n);
+ table = hash0_create(n);
if (in_btr_search) {
table->adaptive = TRUE;
--- 1.4/innobase/ha/hash0hash.c 2006-12-21 02:47:57 +01:00
+++ 1.5/innobase/ha/hash0hash.c 2006-12-21 02:47:57 +01:00
@@ -74,7 +74,7 @@
chosen to be a prime number slightly bigger than n. */
hash_table_t*
-hash_create(
+hash0_create(
/*========*/
/* out, own: created table */
ulint n) /* in: number of array cells */
--- 1.3/innobase/ibuf/Makefile.am 2006-12-21 02:47:57 +01:00
+++ 1.4/innobase/ibuf/Makefile.am 2006-12-21 02:47:57 +01:00
@@ -17,9 +17,9 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libibuf.a
+noinst_LTLIBRARIES = libibuf.la
-libibuf_a_SOURCES = ibuf0ibuf.c
+libibuf_la_SOURCES = ibuf0ibuf.c
EXTRA_PROGRAMS =
--- 1.6/innobase/include/hash0hash.h 2006-12-21 02:47:57 +01:00
+++ 1.7/innobase/include/hash0hash.h 2006-12-21 02:47:57 +01:00
@@ -23,7 +23,7 @@
of cells is chosen to be a prime number slightly bigger than n. */
hash_table_t*
-hash_create(
+hash0_create(
/*========*/
/* out, own: created table */
ulint n); /* in: number of array cells */
--- 1.2/innobase/lock/Makefile.am 2006-12-21 02:47:58 +01:00
+++ 1.3/innobase/lock/Makefile.am 2006-12-21 02:47:58 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = liblock.a
+noinst_LTLIBRARIES = liblock.la
-liblock_a_SOURCES = lock0lock.c
+liblock_la_SOURCES = lock0lock.c
EXTRA_PROGRAMS =
--- 1.66/innobase/lock/lock0lock.c 2006-12-21 02:47:58 +01:00
+++ 1.67/innobase/lock/lock0lock.c 2006-12-21 02:47:58 +01:00
@@ -584,7 +584,7 @@
{
lock_sys = mem_alloc(sizeof(lock_sys_t));
- lock_sys->rec_hash = hash_create(n_cells);
+ lock_sys->rec_hash = hash0_create(n_cells);
/* hash_create_mutexes(lock_sys->rec_hash, 2, SYNC_REC_LOCK); */
--- 1.2/innobase/log/Makefile.am 2006-12-21 02:47:58 +01:00
+++ 1.3/innobase/log/Makefile.am 2006-12-21 02:47:58 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = liblog.a
+noinst_LTLIBRARIES = liblog.la
-liblog_a_SOURCES = log0log.c log0recv.c
+liblog_la_SOURCES = log0log.c log0recv.c
EXTRA_PROGRAMS =
--- 1.53/innobase/log/log0recv.c 2006-12-21 02:47:58 +01:00
+++ 1.54/innobase/log/log0recv.c 2006-12-21 02:47:58 +01:00
@@ -147,7 +147,7 @@
recv_sys->len = 0;
recv_sys->recovered_offset = 0;
- recv_sys->addr_hash = hash_create(available_memory / 64);
+ recv_sys->addr_hash = hash0_create(available_memory / 64);
recv_sys->n_addrs = 0;
recv_sys->apply_log_recs = FALSE;
@@ -186,7 +186,7 @@
hash_table_free(recv_sys->addr_hash);
mem_heap_empty(recv_sys->heap);
- recv_sys->addr_hash = hash_create(buf_pool_get_curr_size() / 256);
+ recv_sys->addr_hash = hash0_create(buf_pool_get_curr_size() / 256);
}
/************************************************************
--- 1.2/innobase/mach/Makefile.am 2006-12-21 02:47:58 +01:00
+++ 1.3/innobase/mach/Makefile.am 2006-12-21 02:47:58 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libmach.a
+noinst_LTLIBRARIES = libmach.la
-libmach_a_SOURCES = mach0data.c
+libmach_la_SOURCES = mach0data.c
EXTRA_PROGRAMS =
--- 1.4/innobase/mem/Makefile.am 2006-12-21 02:47:58 +01:00
+++ 1.5/innobase/mem/Makefile.am 2006-12-21 02:47:58 +01:00
@@ -17,9 +17,9 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libmem.a
+noinst_LTLIBRARIES = libmem.la
-libmem_a_SOURCES = mem0mem.c mem0pool.c
+libmem_la_SOURCES = mem0mem.c mem0pool.c
EXTRA_DIST = mem0dbg.c
--- 1.2/innobase/mtr/Makefile.am 2006-12-21 02:47:58 +01:00
+++ 1.3/innobase/mtr/Makefile.am 2006-12-21 02:47:58 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libmtr.a
+noinst_LTLIBRARIES = libmtr.la
-libmtr_a_SOURCES = mtr0mtr.c mtr0log.c
+libmtr_la_SOURCES = mtr0mtr.c mtr0log.c
EXTRA_PROGRAMS =
--- 1.4/innobase/os/Makefile.am 2006-12-21 02:47:58 +01:00
+++ 1.5/innobase/os/Makefile.am 2006-12-21 02:47:58 +01:00
@@ -17,9 +17,9 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libos.a
+noinst_LTLIBRARIES = libos.la
-libos_a_SOURCES = os0proc.c os0sync.c os0thread.c os0file.c
+libos_la_SOURCES = os0proc.c os0sync.c os0thread.c os0file.c
EXTRA_PROGRAMS =
--- 1.2/innobase/page/Makefile.am 2006-12-21 02:47:58 +01:00
+++ 1.3/innobase/page/Makefile.am 2006-12-21 02:47:58 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libpage.a
+noinst_LTLIBRARIES = libpage.la
-libpage_a_SOURCES = page0page.c page0cur.c
+libpage_la_SOURCES = page0page.c page0cur.c
EXTRA_PROGRAMS =
--- 1.4/innobase/pars/Makefile.am 2006-12-21 02:47:59 +01:00
+++ 1.5/innobase/pars/Makefile.am 2006-12-21 02:47:59 +01:00
@@ -17,10 +17,10 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libpars.a
+noinst_LTLIBRARIES = libpars.la
noinst_HEADERS = pars0grm.h
-libpars_a_SOURCES = pars0grm.c lexyy.c pars0opt.c pars0pars.c pars0sym.c
+libpars_la_SOURCES = pars0grm.c lexyy.c pars0opt.c pars0pars.c pars0sym.c
EXTRA_PROGRAMS =
--- 1.2/innobase/que/Makefile.am 2006-12-21 02:47:59 +01:00
+++ 1.3/innobase/que/Makefile.am 2006-12-21 02:47:59 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libque.a
+noinst_LTLIBRARIES = libque.la
-libque_a_SOURCES = que0que.c
+libque_la_SOURCES = que0que.c
EXTRA_PROGRAMS =
--- 1.2/innobase/read/Makefile.am 2006-12-21 02:47:59 +01:00
+++ 1.3/innobase/read/Makefile.am 2006-12-21 02:47:59 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libread.a
+noinst_LTLIBRARIES = libread.la
-libread_a_SOURCES = read0read.c
+libread_la_SOURCES = read0read.c
EXTRA_PROGRAMS =
--- 1.2/innobase/rem/Makefile.am 2006-12-21 02:47:59 +01:00
+++ 1.3/innobase/rem/Makefile.am 2006-12-21 02:47:59 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = librem.a
+noinst_LTLIBRARIES = librem.la
-librem_a_SOURCES = rem0rec.c rem0cmp.c
+librem_la_SOURCES = rem0rec.c rem0cmp.c
EXTRA_PROGRAMS =
--- 1.2/innobase/row/Makefile.am 2006-12-21 02:47:59 +01:00
+++ 1.3/innobase/row/Makefile.am 2006-12-21 02:47:59 +01:00
@@ -17,9 +17,9 @@
include ../include/Makefile.i
-noinst_LIBRARIES = librow.a
+noinst_LTLIBRARIES = librow.la
-librow_a_SOURCES = row0ins.c row0mysql.c row0purge.c row0row.c row0sel.c\
+librow_la_SOURCES = row0ins.c row0mysql.c row0purge.c row0row.c row0sel.c\
row0uins.c row0umod.c row0undo.c row0upd.c row0vers.c
EXTRA_PROGRAMS =
--- 1.4/innobase/srv/Makefile.am 2006-12-21 02:47:59 +01:00
+++ 1.5/innobase/srv/Makefile.am 2006-12-21 02:47:59 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libsrv.a
+noinst_LTLIBRARIES = libsrv.la
-libsrv_a_SOURCES = srv0srv.c srv0que.c srv0start.c
+libsrv_la_SOURCES = srv0srv.c srv0que.c srv0start.c
EXTRA_PROGRAMS =
--- 1.3/innobase/sync/Makefile.am 2006-12-21 02:47:59 +01:00
+++ 1.4/innobase/sync/Makefile.am 2006-12-21 02:47:59 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libsync.a
+noinst_LTLIBRARIES = libsync.la
-libsync_a_SOURCES = sync0arr.c sync0rw.c sync0sync.c
+libsync_la_SOURCES = sync0arr.c sync0rw.c sync0sync.c
EXTRA_PROGRAMS =
--- 1.2/innobase/thr/Makefile.am 2006-12-21 02:47:59 +01:00
+++ 1.3/innobase/thr/Makefile.am 2006-12-21 02:47:59 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libthr.a
+noinst_LTLIBRARIES = libthr.la
-libthr_a_SOURCES = thr0loc.c
+libthr_la_SOURCES = thr0loc.c
EXTRA_PROGRAMS =
--- 1.7/innobase/thr/thr0loc.c 2006-12-21 02:47:59 +01:00
+++ 1.8/innobase/thr/thr0loc.c 2006-12-21 02:47:59 +01:00
@@ -224,7 +224,7 @@
ut_a(thr_local_hash == NULL);
- thr_local_hash = hash_create(OS_THREAD_MAX_N + 100);
+ thr_local_hash = hash0_create(OS_THREAD_MAX_N + 100);
mutex_create(&thr_local_mutex);
mutex_set_level(&thr_local_mutex, SYNC_THR_LOCAL);
--- 1.2/innobase/trx/Makefile.am 2006-12-21 02:47:59 +01:00
+++ 1.3/innobase/trx/Makefile.am 2006-12-21 02:47:59 +01:00
@@ -17,9 +17,9 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libtrx.a
+noinst_LTLIBRARIES = libtrx.la
-libtrx_a_SOURCES = trx0purge.c trx0rec.c trx0roll.c trx0rseg.c\
+libtrx_la_SOURCES = trx0purge.c trx0rec.c trx0roll.c trx0rseg.c\
trx0sys.c trx0trx.c trx0undo.c
EXTRA_PROGRAMS =
--- 1.2/innobase/usr/Makefile.am 2006-12-21 02:47:59 +01:00
+++ 1.3/innobase/usr/Makefile.am 2006-12-21 02:47:59 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libusr.a
+noinst_LTLIBRARIES = libusr.la
-libusr_a_SOURCES = usr0sess.c
+libusr_la_SOURCES = usr0sess.c
EXTRA_PROGRAMS =
--- 1.2/innobase/ut/Makefile.am 2006-12-21 02:47:59 +01:00
+++ 1.3/innobase/ut/Makefile.am 2006-12-21 02:47:59 +01:00
@@ -17,8 +17,8 @@
include ../include/Makefile.i
-noinst_LIBRARIES = libut.a
+noinst_LTLIBRARIES = libut.la
-libut_a_SOURCES = ut0byte.c ut0dbg.c ut0mem.c ut0rnd.c ut0ut.c
+libut_la_SOURCES = ut0byte.c ut0dbg.c ut0mem.c ut0rnd.c ut0ut.c
EXTRA_PROGRAMS =
--- 1.20/netware/Makefile.am 2006-12-21 02:47:59 +01:00
+++ 1.21/netware/Makefile.am 2006-12-21 02:48:00 +01:00
@@ -16,14 +16,14 @@
if HAVE_NETWARE
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I..
-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
bin_PROGRAMS = mysqld_safe mysql_install_db mysql_test_run libmysql
mysqld_safe_SOURCES= mysqld_safe.c my_manage.c
mysql_install_db_SOURCES= mysql_install_db.c my_manage.c
mysql_test_run_SOURCES= mysql_test_run.c my_manage.c
libmysql_SOURCES= libmysqlmain.c
-libmysql_LDADD = ../libmysql/.libs/libmysqlclient.a \
+libmysql_LDADD = ../libmysql/.libs/libmysqlclient.la \
@openssl_libs@ @yassl_libs@
netware_build_files = client/mysql.def client/mysqladmin.def \
--- 1.70/libmysqld/Makefile.am 2006-12-21 02:48:00 +01:00
+++ 1.71/libmysqld/Makefile.am 2006-12-21 02:48:00 +01:00
@@ -30,18 +30,43 @@
-I$(top_builddir)/sql -I$(top_srcdir)/sql \
-I$(top_srcdir)/sql/examples \
-I$(top_srcdir)/regex \
+ @bdb_includes@ \
+ @ndbcluster_includes@ \
$(openssl_includes) @ZLIB_INCLUDES@
-noinst_LIBRARIES = libmysqld_int.a
-pkglib_LIBRARIES = libmysqld.a
SUBDIRS = . examples
+
+# The following libraries should be included in libmysqld.a
+INC_LIB= $(top_builddir)/myisam/libmyisam.la \
+ $(top_builddir)/myisammrg/libmyisammrg.la \
+ $(top_builddir)/heap/libheap.la \
+ @innodb_libs@ @bdb_libs_with_path@ \
+ $(top_builddir)/vio/libvio.la \
+ $(top_builddir)/mysys/libmysys.la \
+ $(top_builddir)/dbug/libdbug.la \
+ $(top_builddir)/regex/libregex.la \
+ $(top_builddir)/strings/libmystrings.la
+
+if HAVE_YASSL
+yassl_inc_libs= $(top_srcdir)/extra/yassl/src/libyassl.la \
+ $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la
+endif
+
+# To make it easy for the end user to use the embedded library we
+# generate a total libmysqld.a from all library files,
+
+pkglib_LTLIBRARIES = libmysqld.la
+libmysqld_la_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources)
+libmysqld_la_LIBADD = $(INC_LIB)
+libmysqld_la_LDFLAGS = -static
+
+noinst_HEADERS = embedded_priv.h emb_qcache.h
+
libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc
libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \
- my_time.c
+ my_time.c
sqlexamplessources = ha_example.cc ha_tina.cc
-noinst_HEADERS = embedded_priv.h emb_qcache.h
-
sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
ha_innodb.cc ha_berkeley.cc ha_heap.cc ha_federated.cc \
ha_myisam.cc ha_myisammrg.cc handler.cc sql_handler.cc \
@@ -65,51 +90,6 @@
sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \
parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
ha_blackhole.cc ha_archive.cc my_user.c
-
-libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources)
-libmysqld_a_SOURCES=
-
-# automake misses these
-sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy
-
-# The following libraries should be included in libmysqld.a
-INC_LIB= $(top_builddir)/regex/libregex.a \
- $(top_builddir)/myisam/libmyisam.a \
- $(top_builddir)/myisammrg/libmyisammrg.a \
- $(top_builddir)/heap/libheap.a \
- @innodb_libs@ @bdb_libs_with_path@ \
- $(top_builddir)/mysys/libmysys.a \
- $(top_builddir)/strings/libmystrings.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/vio/libvio.a
-
-
-#
-# To make it easy for the end user to use the embedded library we
-# generate a total libmysqld.a from all library files,
-
-# note - InnoDB libraries have circular dependencies, so in INC_LIB
-# few libraries are present two times. Metrowerks linker doesn't like
-# it at all. Traditional ar has no problems with it, but still there's no
-# need to add the same file twice to the library, so 'sort -u' save us
-# some time and spares unnecessary work.
-
-libmysqld.a: libmysqld_int.a $(INC_LIB)
-if DARWIN_MWCC
- mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u`
-else
- -rm -f libmysqld.a
- if test "$(host_os)" = "netware" ; \
- then \
- $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \
- else \
- for arc in ./libmysqld_int.a $(INC_LIB); do \
- arpath=`echo $$arc|sed 's|[^/]*$$||'`; \
- $(AR) t $$arc|sed "s|^|$$arpath|"; \
- done | sort -u | xargs $(AR) cq libmysqld.a ; \
- $(RANLIB) libmysqld.a ; \
- fi
-endif
## XXX: any time the client interface changes, we'll need to bump
## the version info for libmysqld; however, it's possible for the
--- 1.6/pstack/Makefile.am 2006-12-21 02:48:00 +01:00
+++ 1.7/pstack/Makefile.am 2006-12-21 02:48:00 +01:00
@@ -28,8 +28,8 @@
EXTRA_DIST= $(SRC)
if COMPILE_PSTACK
-pkglib_LIBRARIES = libpstack.a
-libpstack_a_SOURCES = bucomm.c filemode.c linuxthreads.c rddbg.c debug.c ieee.c pstack.c stabs.c
+pkglib_LTLIBRARIES = libpstack.la
+libpstack_la_SOURCES = bucomm.c filemode.c linuxthreads.c rddbg.c debug.c ieee.c pstack.c stabs.c
endif
# Don't update the files from bitkeeper
--- 1.33/libmysqld/examples/Makefile.am 2006-12-21 02:48:00 +01:00
+++ 1.34/libmysqld/examples/Makefile.am 2006-12-21 02:48:00 +01:00
@@ -36,11 +36,12 @@
-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
$(openssl_includes)
LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
-LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS)
+# FIXME this isn't right, how do you do this, link as a "user"?!
+LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.la @LIBDL@ $(CXXLDFLAGS)
mysqltest_embedded_LINK = $(CXXLINK)
mysqltest_embedded_SOURCES = mysqltest.c
-mysqltest_embedded_LDADD = $(LDADD) $(top_builddir)/regex/libregex.a
+mysqltest_embedded_LDADD = $(top_builddir)/regex/libregex.la $(LDADD)
mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \
my_readline.h sql_string.h completion_hash.h
--- 1.11/ndb/config/type_ndbapitest.mk.am 2006-12-21 02:48:00 +01:00
+++ 1.12/ndb/config/type_ndbapitest.mk.am 2006-12-21 02:48:00 +01:00
@@ -1,9 +1,9 @@
-LDADD += $(top_builddir)/ndb/test/src/libNDBT.a \
+LDADD += $(top_builddir)/ndb/test/src/libNDBT.la \
$(top_builddir)/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@
INCLUDES += -I$(top_srcdir) \
-I$(top_builddir)/include \
--- 1.11/ndb/src/common/util/Makefile.am 2006-12-21 02:48:00 +01:00
+++ 1.12/ndb/src/common/util/Makefile.am 2006-12-21 02:48:00 +01:00
@@ -16,9 +16,9 @@
testBitmask_SOURCES = testBitmask.cpp
testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \
$(top_builddir)/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
--- 1.12/ndb/src/cw/cpcd/Makefile.am 2006-12-21 02:48:00 +01:00
+++ 1.13/ndb/src/cw/cpcd/Makefile.am 2006-12-21 02:48:00 +01:00
@@ -5,9 +5,9 @@
LDADD_LOC = \
$(top_builddir)/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)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_util.mk.am
--- 1.14/ndb/src/kernel/Makefile.am 2006-12-21 02:48:00 +01:00
+++ 1.15/ndb/src/kernel/Makefile.am 2006-12-21 02:48:00 +01:00
@@ -26,23 +26,23 @@
-I$(srcdir)/blocks/dbtux
LDADD += \
- blocks/cmvmi/libcmvmi.a \
- blocks/dbacc/libdbacc.a \
- blocks/dbdict/libdbdict.a \
- blocks/dbdih/libdbdih.a \
- blocks/dblqh/libdblqh.a \
- blocks/dbtc/libdbtc.a \
- blocks/dbtup/libdbtup.a \
- blocks/ndbfs/libndbfs.a \
- blocks/ndbcntr/libndbcntr.a \
- blocks/qmgr/libqmgr.a \
- blocks/trix/libtrix.a \
- blocks/backup/libbackup.a \
- blocks/dbutil/libdbutil.a \
- blocks/suma/libsuma.a \
- blocks/dbtux/libdbtux.a \
- vm/libkernel.a \
- error/liberror.a \
+ blocks/cmvmi/libcmvmi.la \
+ blocks/dbacc/libdbacc.la \
+ blocks/dbdict/libdbdict.la \
+ blocks/dbdih/libdbdih.la \
+ blocks/dblqh/libdblqh.la \
+ blocks/dbtc/libdbtc.la \
+ blocks/dbtup/libdbtup.la \
+ blocks/ndbfs/libndbfs.la \
+ blocks/ndbcntr/libndbcntr.la \
+ blocks/qmgr/libqmgr.la \
+ blocks/trix/libtrix.la \
+ blocks/backup/libbackup.la \
+ blocks/dbutil/libdbutil.la \
+ blocks/suma/libsuma.la \
+ blocks/dbtux/libdbtux.la \
+ vm/libkernel.la \
+ error/liberror.la \
$(top_builddir)/ndb/src/common/transporter/libtransporter.la \
$(top_builddir)/ndb/src/common/debugger/libtrace.la \
$(top_builddir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \
@@ -51,9 +51,9 @@
$(top_builddir)/ndb/src/mgmapi/libmgmapi.la \
$(top_builddir)/ndb/src/common/portlib/libportlib.la \
$(top_builddir)/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 @NDB_SCI_LIBS@
# Don't update the files from bitkeeper
%::SCCS/s.%
--- 1.4/ndb/src/kernel/blocks/backup/Makefile.am 2006-12-21 02:48:00 +01:00
+++ 1.5/ndb/src/kernel/blocks/backup/Makefile.am 2006-12-21 02:48:00 +01:00
@@ -1,7 +1,7 @@
-noinst_LIBRARIES = libbackup.a
+noinst_LTLIBRARIES = libbackup.la
-libbackup_a_SOURCES = Backup.cpp BackupInit.cpp
+libbackup_la_SOURCES = Backup.cpp BackupInit.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
@@ -18,7 +18,7 @@
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libbackup_a_SOURCES)
+ @$(top_srcdir)/ndb/config/win-sources $@ $(libbackup_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.3/ndb/src/kernel/blocks/cmvmi/Makefile.am 2006-12-21 02:48:00 +01:00
+++ 1.4/ndb/src/kernel/blocks/cmvmi/Makefile.am 2006-12-21 02:48:00 +01:00
@@ -1,7 +1,7 @@
-noinst_LIBRARIES = libcmvmi.a
+noinst_LTLIBRARIES = libcmvmi.la
-libcmvmi_a_SOURCES = Cmvmi.cpp
+libcmvmi_la_SOURCES = Cmvmi.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
@@ -18,7 +18,7 @@
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libcmvmi_a_SOURCES)
+ @$(top_srcdir)/ndb/config/win-sources $@ $(libcmvmi_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.5/ndb/src/kernel/blocks/dbacc/Makefile.am 2006-12-21 02:48:00 +01:00
+++ 1.6/ndb/src/kernel/blocks/dbacc/Makefile.am 2006-12-21 02:48:00 +01:00
@@ -1,7 +1,7 @@
-noinst_LIBRARIES = libdbacc.a
+noinst_LTLIBRARIES = libdbacc.la
-libdbacc_a_SOURCES = DbaccInit.cpp DbaccMain.cpp
+libdbacc_la_SOURCES = DbaccInit.cpp DbaccMain.cpp
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/kernel/blocks/dbtup
@@ -20,7 +20,7 @@
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libdbacc_a_SOURCES)
+ @$(top_srcdir)/ndb/config/win-sources $@ $(libdbacc_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.4/ndb/src/kernel/blocks/dbdict/Makefile.am 2006-12-21 02:48:00 +01:00
+++ 1.5/ndb/src/kernel/blocks/dbdict/Makefile.am 2006-12-21 02:48:00 +01:00
@@ -1,7 +1,7 @@
-noinst_LIBRARIES = libdbdict.a
+noinst_LTLIBRARIES = libdbdict.la
EXTRA_PROGRAMS = printSchemaFile
-libdbdict_a_SOURCES = Dbdict.cpp
+libdbdict_la_SOURCES = Dbdict.cpp
printSchemaFile_SOURCES = printSchemaFile.cpp
@@ -11,9 +11,9 @@
LDADD += \
$(top_builddir)/ndb/src/common/util/libgeneral.la \
$(top_builddir)/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
# Don't update the files from bitkeeper
%::SCCS/s.%
@@ -27,7 +27,7 @@
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libdbdict_a_SOURCES)
+ @$(top_srcdir)/ndb/config/win-sources $@ $(libdbdict_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.4/ndb/src/kernel/blocks/dbdih/Makefile.am 2006-12-21 02:48:00 +01:00
+++ 1.5/ndb/src/kernel/blocks/dbdih/Makefile.am 2006-12-21 02:48:01 +01:00
@@ -1,7 +1,7 @@
-noinst_LIBRARIES = libdbdih.a
+noinst_LTLIBRARIES = libdbdih.la
EXTRA_PROGRAMS = ndbd_sysfile_reader
-libdbdih_a_SOURCES = DbdihInit.cpp DbdihMain.cpp
+libdbdih_la_SOURCES = DbdihInit.cpp DbdihMain.cpp
ndbd_sysfile_reader_SOURCES = printSysfile/printSysfile.cpp
include $(top_srcdir)/ndb/config/common.mk.am
@@ -23,7 +23,7 @@
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libdbdih_a_SOURCES)
+ @$(top_srcdir)/ndb/config/win-sources $@ $(libdbdih_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.4/ndb/src/kernel/blocks/dblqh/Makefile.am 2006-12-21 02:48:01 +01:00
+++ 1.5/ndb/src/kernel/blocks/dblqh/Makefile.am 2006-12-21 02:48:01 +01:00
@@ -1,7 +1,7 @@
-noinst_LIBRARIES = libdblqh.a
+noinst_LTLIBRARIES = libdblqh.la
EXTRA_PROGRAMS = ndbd_redo_log_reader
-libdblqh_a_SOURCES = DblqhInit.cpp DblqhMain.cpp
+libdblqh_la_SOURCES = DblqhInit.cpp DblqhMain.cpp
ndbd_redo_log_reader_SOURCES = redoLogReader/records.cpp redoLogReader/redoLogFileReader.cpp
include $(top_srcdir)/ndb/config/common.mk.am
@@ -23,7 +23,7 @@
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libdblqh_a_SOURCES)
+ @$(top_srcdir)/ndb/config/win-sources $@ $(libdblqh_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.3/ndb/src/kernel/blocks/dbtc/Makefile.am 2006-12-21 02:48:01 +01:00
+++ 1.4/ndb/src/kernel/blocks/dbtc/Makefile.am 2006-12-21 02:48:01 +01:00
@@ -1,6 +1,6 @@
-noinst_LIBRARIES = libdbtc.a
+noinst_LTLIBRARIES = libdbtc.la
-libdbtc_a_SOURCES = DbtcInit.cpp DbtcMain.cpp
+libdbtc_la_SOURCES = DbtcInit.cpp DbtcMain.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
@@ -17,7 +17,7 @@
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libdbtc_a_SOURCES)
+ @$(top_srcdir)/ndb/config/win-sources $@ $(libdbtc_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.4/ndb/src/kernel/blocks/dbtup/Makefile.am 2006-12-21 02:48:01 +01:00
+++ 1.5/ndb/src/kernel/blocks/dbtup/Makefile.am 2006-12-21 02:48:01 +01:00
@@ -1,6 +1,6 @@
-noinst_LIBRARIES = libdbtup.a
+noinst_LTLIBRARIES = libdbtup.la
-libdbtup_a_SOURCES = \
+libdbtup_la_SOURCES = \
DbtupExecQuery.cpp \
DbtupBuffer.cpp \
DbtupRoutines.cpp \
@@ -36,7 +36,7 @@
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libdbtup_a_SOURCES)
+ @$(top_srcdir)/ndb/config/win-sources $@ $(libdbtup_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.5/ndb/src/kernel/blocks/dbtux/Makefile.am 2006-12-21 02:48:01 +01:00
+++ 1.6/ndb/src/kernel/blocks/dbtux/Makefile.am 2006-12-21 02:48:01 +01:00
@@ -1,6 +1,6 @@
-noinst_LIBRARIES = libdbtux.a
+noinst_LTLIBRARIES = libdbtux.la
-libdbtux_a_SOURCES = \
+libdbtux_la_SOURCES = \
DbtuxGen.cpp \
DbtuxMeta.cpp \
DbtuxMaint.cpp \
@@ -28,7 +28,7 @@
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libdbtux_a_SOURCES)
+ @$(top_srcdir)/ndb/config/win-sources $@ $(libdbtux_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.3/ndb/src/kernel/blocks/dbutil/Makefile.am 2006-12-21 02:48:01 +01:00
+++ 1.4/ndb/src/kernel/blocks/dbutil/Makefile.am 2006-12-21 02:48:01 +01:00
@@ -1,6 +1,6 @@
-noinst_LIBRARIES = libdbutil.a
+noinst_LTLIBRARIES = libdbutil.la
-libdbutil_a_SOURCES = DbUtil.cpp
+libdbutil_la_SOURCES = DbUtil.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
@@ -17,7 +17,7 @@
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libdbutil_a_SOURCES)
+ @$(top_srcdir)/ndb/config/win-sources $@ $(libdbutil_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.3/ndb/src/kernel/blocks/ndbcntr/Makefile.am 2006-12-21 02:48:01 +01:00
+++ 1.4/ndb/src/kernel/blocks/ndbcntr/Makefile.am 2006-12-21 02:48:01 +01:00
@@ -1,6 +1,6 @@
-noinst_LIBRARIES = libndbcntr.a
+noinst_LTLIBRARIES = libndbcntr.la
-libndbcntr_a_SOURCES = \
+libndbcntr_la_SOURCES = \
NdbcntrInit.cpp \
NdbcntrSysTable.cpp \
NdbcntrMain.cpp
@@ -20,7 +20,7 @@
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libndbcntr_a_SOURCES)
+ @$(top_srcdir)/ndb/config/win-sources $@ $(libndbcntr_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.3/ndb/src/kernel/blocks/ndbfs/Makefile.am 2006-12-21 02:48:01 +01:00
+++ 1.4/ndb/src/kernel/blocks/ndbfs/Makefile.am 2006-12-21 02:48:01 +01:00
@@ -1,6 +1,6 @@
-noinst_LIBRARIES = libndbfs.a
+noinst_LTLIBRARIES = libndbfs.la
-libndbfs_a_SOURCES = \
+libndbfs_la_SOURCES = \
AsyncFile.cpp \
Ndbfs.cpp VoidFs.cpp \
Filename.cpp \
@@ -21,7 +21,7 @@
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libndbfs_a_SOURCES)
+ @$(top_srcdir)/ndb/config/win-sources $@ $(libndbfs_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.3/ndb/src/kernel/blocks/qmgr/Makefile.am 2006-12-21 02:48:01 +01:00
+++ 1.4/ndb/src/kernel/blocks/qmgr/Makefile.am 2006-12-21 02:48:01 +01:00
@@ -1,6 +1,6 @@
-noinst_LIBRARIES = libqmgr.a
+noinst_LTLIBRARIES = libqmgr.la
-libqmgr_a_SOURCES = \
+libqmgr_la_SOURCES = \
QmgrInit.cpp \
QmgrMain.cpp
@@ -19,7 +19,7 @@
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libqmgr_a_SOURCES)
+ @$(top_srcdir)/ndb/config/win-sources $@ $(libqmgr_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.4/ndb/src/kernel/blocks/suma/Makefile.am 2006-12-21 02:48:01 +01:00
+++ 1.5/ndb/src/kernel/blocks/suma/Makefile.am 2006-12-21 02:48:01 +01:00
@@ -1,6 +1,6 @@
-noinst_LIBRARIES = libsuma.a
+noinst_LTLIBRARIES = libsuma.la
-libsuma_a_SOURCES = Suma.cpp SumaInit.cpp
+libsuma_la_SOURCES = Suma.cpp SumaInit.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
@@ -17,7 +17,7 @@
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libsuma_a_SOURCES)
+ @$(top_srcdir)/ndb/config/win-sources $@ $(libsuma_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.3/ndb/src/kernel/blocks/trix/Makefile.am 2006-12-21 02:48:02 +01:00
+++ 1.4/ndb/src/kernel/blocks/trix/Makefile.am 2006-12-21 02:48:02 +01:00
@@ -1,6 +1,6 @@
-noinst_LIBRARIES = libtrix.a
+noinst_LTLIBRARIES = libtrix.la
-libtrix_a_SOURCES = Trix.cpp
+libtrix_la_SOURCES = Trix.cpp
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_kernel.mk.am
@@ -17,7 +17,7 @@
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libtrix_a_SOURCES)
+ @$(top_srcdir)/ndb/config/win-sources $@ $(libtrix_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.5/ndb/src/kernel/error/Makefile.am 2006-12-21 02:48:02 +01:00
+++ 1.6/ndb/src/kernel/error/Makefile.am 2006-12-21 02:48:02 +01:00
@@ -1,6 +1,6 @@
-noinst_LIBRARIES = liberror.a
+noinst_LTLIBRARIES = liberror.la
-liberror_a_SOURCES = TimeModule.cpp \
+liberror_la_SOURCES = TimeModule.cpp \
ErrorReporter.cpp \
ndbd_exit_codes.c
@@ -19,7 +19,7 @@
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(liberror_a_SOURCES)
+ @$(top_srcdir)/ndb/config/win-sources $@ $(liberror_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.8/ndb/src/kernel/vm/Makefile.am 2006-12-21 02:48:02 +01:00
+++ 1.9/ndb/src/kernel/vm/Makefile.am 2006-12-21 02:48:02 +01:00
@@ -3,9 +3,9 @@
#DIRS += testLongSig
#endif
-noinst_LIBRARIES = libkernel.a
+noinst_LTLIBRARIES = libkernel.la
-libkernel_a_SOURCES = \
+libkernel_la_SOURCES = \
SimulatedBlock.cpp \
FastScheduler.cpp \
TimeQueue.cpp \
@@ -37,7 +37,7 @@
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libkernel_a_SOURCES)
+ @$(top_srcdir)/ndb/config/win-sources $@ $(libkernel_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.17/ndb/src/mgmclient/Makefile.am 2006-12-21 02:48:02 +01:00
+++ 1.18/ndb/src/mgmclient/Makefile.am 2006-12-21 02:48:02 +01:00
@@ -21,9 +21,9 @@
LDADD_LOC = $(noinst_LTLIBRARIES) \
../common/portlib/libportlib.la \
@readline_link@ \
- $(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@
--- 1.23/ndb/src/mgmsrv/Makefile.am 2006-12-21 02:48:02 +01:00
+++ 1.24/ndb/src/mgmsrv/Makefile.am 2006-12-21 02:48:02 +01:00
@@ -25,9 +25,9 @@
LDADD_LOC = $(top_builddir)/ndb/src/mgmclient/CommandInterpreter.o \
$(top_builddir)/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@
--- 1.27/ndb/test/ndbapi/Makefile.am 2006-12-21 02:48:02 +01:00
+++ 1.28/ndb/test/ndbapi/Makefile.am 2006-12-21 02:48:02 +01:00
@@ -96,8 +96,8 @@
##testIndex_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
##testSystemRestart_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
##testTransactions_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
-testBackup_LDADD = $(LDADD) bank/libbank.a
-testSRBank_LDADD = bank/libbank.a $(LDADD)
+testBackup_LDADD = $(LDADD) bank/libbank.la
+testSRBank_LDADD = bank/libbank.la $(LDADD)
# Don't update the files from bitkeeper
%::SCCS/s.%
--- 1.5/ndb/test/ndbapi/bank/Makefile.am 2006-12-21 02:48:02 +01:00
+++ 1.6/ndb/test/ndbapi/bank/Makefile.am 2006-12-21 02:48:02 +01:00
@@ -1,9 +1,9 @@
ndbtest_PROGRAMS = testBank bankSumAccounts bankValidateAllGLs bankMakeGL bankTransactionMaker bankCreator bankTimer
-noinst_LIBRARIES = libbank.a
+noinst_LTLIBRARIES = libbank.la
-libbank_a_SOURCES = Bank.cpp BankLoad.cpp Bank.hpp
+libbank_la_SOURCES = Bank.cpp BankLoad.cpp Bank.hpp
testBank_SOURCES = testBank.cpp
bankSumAccounts_SOURCES = bankSumAccounts.cpp
@@ -13,7 +13,7 @@
bankCreator_SOURCES = bankCreator.cpp
bankTimer_SOURCES = bankTimer.cpp
-LDADD_LOC = $(noinst_LIBRARIES)
+LDADD_LOC = $(noinst_LTLIBRARIES)
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
--- 1.23/ndb/test/run-test/Makefile.am 2006-12-21 02:48:02 +01:00
+++ 1.24/ndb/test/run-test/Makefile.am 2006-12-21 02:48:02 +01:00
@@ -16,11 +16,11 @@
atrt_SOURCES = main.cpp run-test.hpp
INCLUDES_LOC = -I$(top_srcdir)/ndb/test/include
-LDADD_LOC = $(top_builddir)/ndb/test/src/libNDBT.a \
+LDADD_LOC = $(top_builddir)/ndb/test/src/libNDBT.la \
$(top_builddir)/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@
wrappersdir=$(prefix)/bin
wrappers_SCRIPTS=atrt-testBackup atrt-mysql-test-run
--- 1.8/ndb/test/src/Makefile.am 2006-12-21 02:48:03 +01:00
+++ 1.9/ndb/test/src/Makefile.am 2006-12-21 02:48:03 +01:00
@@ -1,7 +1,7 @@
-noinst_LIBRARIES = libNDBT.a
+noinst_LTLIBRARIES = libNDBT.la
-libNDBT_a_SOURCES = \
+libNDBT_la_SOURCES = \
NDBT_ReturnCodes.cpp \
NDBT_Error.cpp NDBT_Tables.cpp NDBT_ResultRow.cpp \
NDBT_Test.cpp HugoCalculator.cpp \
@@ -29,7 +29,7 @@
$(top_srcdir)/ndb/config/win-sources \
$(top_srcdir)/ndb/config/win-libraries
cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libNDBT_a_SOURCES)
+ @$(top_srcdir)/ndb/config/win-sources $@ $(libNDBT_la_SOURCES)
@$(top_srcdir)/ndb/config/win-libraries $@ LIB
--- 1.11/ndb/config/type_ndbapitools.mk.am 2006-12-21 02:48:03 +01:00
+++ 1.12/ndb/config/type_ndbapitools.mk.am 2006-12-21 02:48:03 +01:00
@@ -1,9 +1,9 @@
LDADD += \
$(top_builddir)/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@
INCLUDES += -I$(srcdir) \
-I$(top_builddir)/include \
--- 1.15/cmd-line-utils/libedit/Makefile.am 2006-12-21 02:48:03 +01:00
+++ 1.16/cmd-line-utils/libedit/Makefile.am 2006-12-21 02:48:03 +01:00
@@ -8,18 +8,18 @@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(srcdir)/../.. -I..
-noinst_LIBRARIES = libedit.a
+noinst_LTLIBRARIES = libedit.la
-libedit_a_SOURCES = chared.c el.c history.c map.c prompt.c readline.c \
+libedit_la_SOURCES = chared.c el.c history.c map.c prompt.c readline.c \
search.c tokenizer.c vi.c common.c emacs.c \
hist.c key.c parse.c read.c refresh.c sig.c term.c \
tty.c help.c fcns.c
-EXTRA_libedit_a_SOURCES = np/unvis.c np/strlcpy.c np/vis.c np/strlcat.c \
+EXTRA_libedit_la_SOURCES = np/unvis.c np/strlcpy.c np/vis.c np/strlcat.c \
np/fgetln.c
-libedit_a_LIBADD = @LIBEDIT_LOBJECTS@
-libedit_a_DEPENDENCIES = @LIBEDIT_LOBJECTS@
+libedit_la_LIBADD = @LIBEDIT_LOBJECTS@
+libedit_la_DEPENDENCIES = @LIBEDIT_LOBJECTS@
pkginclude_HEADERS = readline/readline.h
| Thread |
|---|
| • bk commit into 5.0 tree (kent:1.2347) BUG#13859 | kent | 21 Dec |
