[Commits] Rev 2931: MWL#74: After-review fixes. in http://bazaar.launchpad.net/~maria-captains/maria/5.1

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Fri Nov 12 20:14:57 EET 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.1

------------------------------------------------------------
revno: 2931
revision-id: knielsen at knielsen-hq.org-20101112181454-u4yy5aiysnvdc6sw
parent: knielsen at knielsen-hq.org-20101112121518-k7tr3pqaxiwex4jr
committer: knielsen at knielsen-hq.org
branch nick: work-5.1-mwl74
timestamp: Fri 2010-11-12 19:14:54 +0100
message:
  MWL#74: After-review fixes.
  
  Avoid building and linking libmysys.so etc. Instead, trick Automake
  into installing libtool-built libmysys.a etc. by copying it from
  .libs/libmysys.a. This allows to keep linking libmysys etc. statically
  into libmysqld, so we avoid introducing new dependencies in 5.1.
  
  Simplify the patch based on this.
=== modified file 'client/Makefile.am'
--- a/client/Makefile.am	2010-09-28 13:07:42 +0000
+++ b/client/Makefile.am	2010-11-12 18:14:54 +0000
@@ -75,7 +75,7 @@ mysqlimport_CFLAGS=		-DTHREAD -UUNDEF_TH
 mysqlimport_LDADD =             $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
                                 @CLIENT_EXTRA_LDFLAGS@ \
                                 $(LIBMYSQLCLIENT_LA) \
-                                $(top_builddir)/mysys/libmysys.la
+                                $(top_builddir)/mysys/libmysys.a
 
 mysqlshow_SOURCES=              mysqlshow.c
 
@@ -84,14 +84,14 @@ mysqlslap_CFLAGS=		-DTHREAD -UMYSQL_CLIE
 mysqlslap_LDADD =               $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
                                 @CLIENT_EXTRA_LDFLAGS@ \
                                 $(LIBMYSQLCLIENT_LA) \
-                                $(top_builddir)/mysys/libmysys.la
+                                $(top_builddir)/mysys/libmysys.a
 
 mysqltest_SOURCES=              mysqltest.cc
 mysqltest_CXXFLAGS=             -DTHREAD -UMYSQL_CLIENT_NO_THREADS
 mysqltest_LDADD =               $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
                                 @CLIENT_EXTRA_LDFLAGS@ \
                                 $(LIBMYSQLCLIENT_LA) \
-                                $(top_builddir)/mysys/libmysys.la \
+                                $(top_builddir)/mysys/libmysys.a \
                                 $(top_builddir)/regex/libregex.la
                                 $(CLIENT_THREAD_LIBS)
 

=== modified file 'config/ac-macros/plugins.m4'
--- a/config/ac-macros/plugins.m4	2010-09-30 11:53:02 +0000
+++ b/config/ac-macros/plugins.m4	2010-11-12 18:14:54 +0000
@@ -539,14 +539,6 @@ dnl
  ])
 ])
 
-# If not building libmysqld embedded server, then there is no need to build
-# shared object versions of static plugins.
-if test "$with_embedded_server" = "yes"; then
-  AC_SUBST([plugin_static_if_no_embedded], "")
-else
-  AC_SUBST([plugin_static_if_no_embedded], "-static")
-fi
-
 AC_DEFUN([_MYSQL_EMIT_PLUGIN_ACTIONS],[
  ifelse($#, 0, [], $#, 1, [
   _MYSQL_EMIT_PLUGIN_ACTION([$1])

=== modified file 'configure.in'
--- a/configure.in	2010-11-12 12:15:18 +0000
+++ b/configure.in	2010-11-12 18:14:54 +0000
@@ -250,7 +250,7 @@ AC_PROG_LIBTOOL
 
 # Ensure that we have --preserve-dup-deps defines, otherwise we get link
 # problems of 'mysql' with CXX=g++
-LIBTOOL="$LIBTOOL --preserve-dup-deps"
+#LIBTOOL="$LIBTOOL --preserve-dup-deps"
 AC_SUBST(LIBTOOL)dnl
 
 AC_SUBST(NM)dnl
@@ -2529,6 +2529,8 @@ MYSQL_STORAGE_ENGINE(partition, partitio
 
 dnl -- ndbcluster requires partition to be enabled
 
+MYSQL_CONFIGURE_PLUGINS([default])
+
 # Only build client code?
 AC_ARG_WITH(server,
     [  --without-server        Only build the client.],
@@ -2542,8 +2544,6 @@ AC_ARG_WITH(embedded-server,
     [with_embedded_server=no]
 )
 
-MYSQL_CONFIGURE_PLUGINS([default])
-
 AC_ARG_WITH(query_cache,
     [  --without-query-cache   Do not build query cache.],
     [with_query_cache=$withval],

=== modified file 'dbug/Makefile.am'
--- a/dbug/Makefile.am	2010-09-30 11:53:02 +0000
+++ b/dbug/Makefile.am	2010-11-12 18:14:54 +0000
@@ -16,8 +16,9 @@
 # MA 02111-1307, USA
 
 INCLUDES =              -I$(top_builddir)/include -I$(top_srcdir)/include
-LDADD =                 libdbug.la $(top_builddir)/mysys/libmysys.la $(top_builddir)/strings/libmystrings.la
-pkglib_LTLIBRARIES =    libdbug.la
+LDADD =                 libdbug.a $(top_builddir)/mysys/libmysys.a $(top_builddir)/strings/libmystrings.a
+pkglib_LIBRARIES =      libdbug.a
+noinst_LTLIBRARIES =    libdbug.la
 noinst_HEADERS =        dbug_long.h
 libdbug_la_SOURCES =    dbug.c sanity.c
 EXTRA_DIST =            CMakeLists.txt example1.c example2.c example3.c \
@@ -65,3 +66,6 @@ output5.r:      factorial
 # a hack to have executable in builddir, not in srcdir
 tests-t:        tests-t.pl
                 cp -f $(srcdir)/tests-t.pl ./tests-t
+
+libdbug.a: libdbug.la
+        $(CP) .libs/libdbug.a $@

=== modified file 'extra/Makefile.am'
--- a/extra/Makefile.am	2010-09-30 11:53:02 +0000
+++ b/extra/Makefile.am	2010-11-12 18:14:54 +0000
@@ -16,9 +16,9 @@
 INCLUDES =              -I$(top_builddir)/include -I$(top_srcdir)/include \
                         -I$(top_srcdir)/sql
 LDADD =                 @CLIENT_EXTRA_LDFLAGS@ \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la \
+                        $(top_builddir)/mysys/libmysys.a \
+                        $(top_builddir)/strings/libmystrings.a \
+                        $(top_builddir)/dbug/libdbug.a \
                         $(ZLIB_LIBS)
 BUILT_SOURCES=          $(top_builddir)/include/mysqld_error.h \
                         $(top_builddir)/include/sql_state.h \

=== modified file 'libmysqld/examples/Makefile.am'
--- a/libmysqld/examples/Makefile.am	2010-09-30 11:53:02 +0000
+++ b/libmysqld/examples/Makefile.am	2010-11-12 18:14:54 +0000
@@ -39,10 +39,7 @@ INCLUDES =	-I$(top_builddir)/include -I$
 LIBS =          @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
 LDADD =         @CLIENT_EXTRA_LDFLAGS@ \
                 $(top_builddir)/libmysqld/libmysqld.la @LIBDL@ $(CXXLDFLAGS) \
-                @ndbcluster_libs@ @NDB_SCI_LIBS@ \
-                $(top_builddir)/mysys/libmysys.la \
-                $(top_builddir)/strings/libmystrings.la \
-                $(top_builddir)/dbug/libdbug.la
+                @ndbcluster_libs@ @NDB_SCI_LIBS@
 
 mysqltest_embedded_LINK = $(CXXLINK)
 nodist_mysqltest_embedded_SOURCES =     mysqltest.cc

=== modified file 'mysys/Makefile.am'
--- a/mysys/Makefile.am	2010-09-28 13:07:42 +0000
+++ b/mysys/Makefile.am	2010-11-12 18:14:54 +0000
@@ -18,8 +18,9 @@ MYSQLSHAREdir =		$(pkgdatadir)
 MYSQLBASEdir=           $(prefix)
 INCLUDES =              @ZLIB_INCLUDES@ -I$(top_builddir)/include \
                         -I$(top_srcdir)/include -I$(srcdir)
-pkglib_LTLIBRARIES =    libmysys.la
-LDADD =                 libmysys.la $(top_builddir)/strings/libmystrings.la $(top_builddir)/dbug/libdbug.la
+pkglib_LIBRARIES =      libmysys.a
+noinst_LTLIBRARIES =    libmysys.la
+LDADD =                 libmysys.a $(top_builddir)/strings/libmystrings.a $(top_builddir)/dbug/libdbug.a
 noinst_HEADERS =        mysys_priv.h my_static.h my_handler_errors.h \
                         my_safehash.h
 libmysys_la_SOURCES =   my_init.c my_getwd.c mf_getdate.c my_mmap.c \
@@ -58,7 +59,7 @@ libmysys_la_SOURCES =	my_init.c my_getwd
                         my_windac.c my_access.c base64.c my_libwrap.c \
                         wqueue.c
 libmysys_la_LDFLAGS =   $(AM_LDFLAGS) @WRAPLIBS@
-libmysys_la_LIBADD =    $(top_builddir)/strings/libmystrings.la $(ZLIB_LIBS)
+libmysys_la_LIBADD =    $(ZLIB_LIBS)
 
 if NEED_THREAD
 # mf_keycache is used only in the server, so it is safe to leave the file
@@ -73,10 +74,10 @@ EXTRA_DIST =		thr_alarm.c thr_lock.c my_
                         thr_mutex.c thr_rwlock.c waiting_threads.c \
                         CMakeLists.txt mf_soundex.c \
                         my_conio.c my_wincond.c my_winthread.c
-# test_dir_DEPENDENCIES=        $(LTLIBRARIES)
-# testhash_DEPENDENCIES=        $(LTLIBRARIES)
-# test_charset_DEPENDENCIES=    $(LTLIBRARIES)
-# charset2html_DEPENDENCIES=    $(LTLIBRARIES)
+# test_dir_DEPENDENCIES=        $(LIBRARIES)
+# testhash_DEPENDENCIES=        $(LIBRARIES)
+# test_charset_DEPENDENCIES=    $(LIBRARIES)
+# charset2html_DEPENDENCIES=    $(LIBRARIES)
 DEFS =                  -DDEFAULT_BASEDIR=\"$(prefix)\" \
                         -DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \
                         -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
@@ -96,55 +97,58 @@ CLEANFILES =		test_bitmap$(EXEEXT) test_
                         testhash$(EXEEXT) test_gethwaddr$(EXEEXT) \
                         test_base64$(EXEEXT) test_thr_mutex$(EXEEXT)
 
+libmysys.a: libmysys.la
+        $(CP) .libs/libmysys.a $@
+
 #
 # 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 $(LTLIBRARIES)
+test_bitmap$(EXEEXT): my_bitmap.c $(LIBRARIES)
         $(LINK) $(FLAGS) -DMAIN  ./my_bitmap.c $(LDADD) $(LIBS)
 
-test_priority_queue$(EXEEXT): queues.c $(LTLIBRARIES)
+test_priority_queue$(EXEEXT): queues.c $(LIBRARIES)
         $(LINK) $(FLAGS) -DMAIN  ./queues.c $(LDADD) $(LIBS)
 
-test_thr_alarm$(EXEEXT): thr_alarm.c $(LTLIBRARIES)
+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 $(LTLIBRARIES)
+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 $(LTLIBRARIES)
+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 $(LTLIBRARIES)
+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 $(LTLIBRARIES)
+test_dir$(EXEEXT): test_dir.c $(LIBRARIES)
         $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)
 
-test_charset$(EXEEXT): test_charset.c $(LTLIBRARIES)
+test_charset$(EXEEXT): test_charset.c $(LIBRARIES)
         $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)
 
-testhash$(EXEEXT): testhash.c $(LTLIBRARIES)
+testhash$(EXEEXT): testhash.c $(LIBRARIES)
         $(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS)
 
-test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LTLIBRARIES)
+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 $(LTLIBRARIES)
+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
 
-test_thr_mutex$(EXEEXT): test_thr_mutex.c $(LTLIBRARIES)
+test_thr_mutex$(EXEEXT): test_thr_mutex.c $(LIBRARIES)
         $(LINK) $(FLAGS) $(srcdir)/test_thr_mutex.c $(LDADD) $(LIBS)

=== modified file 'server-tools/instance-manager/Makefile.am'
--- a/server-tools/instance-manager/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/server-tools/instance-manager/Makefile.am	2010-11-12 18:14:54 +0000
@@ -87,10 +87,10 @@ mysqlmanager_SOURCES=	command.cc command
 mysqlmanager_LDADD=     @CLIENT_EXTRA_LDFLAGS@ \
                         liboptions.la \
                         libnet.a \
-                        $(top_builddir)/vio/libvio.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/strings/libmystrings.la \
-                        $(top_builddir)/dbug/libdbug.la \
+                        $(top_builddir)/vio/libvio.a \
+                        $(top_builddir)/mysys/libmysys.a \
+                        $(top_builddir)/strings/libmystrings.a \
+                        $(top_builddir)/dbug/libdbug.a \
                         @openssl_libs@ @yassl_libs@ @ZLIB_LIBS@
 
 EXTRA_DIST =            WindowsService.cpp WindowsService.h IMService.cpp \

=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2010-09-28 13:07:42 +0000
+++ b/sql/Makefile.am	2010-11-12 18:14:54 +0000
@@ -33,11 +33,11 @@ bin_PROGRAMS =		mysql_tzinfo_to_sql
 noinst_LTLIBRARIES=     libndb.la \
                         udf_example.la
 
-SUPPORTING_LIBS =       $(top_builddir)/vio/libvio.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
+SUPPORTING_LIBS =       $(top_builddir)/vio/libvio.a \
+                        $(top_builddir)/mysys/libmysys.a \
+                        $(top_builddir)/dbug/libdbug.a \
                         $(top_builddir)/regex/libregex.la \
-                        $(top_builddir)/strings/libmystrings.la
+                        $(top_builddir)/strings/libmystrings.a
 mysqld_DEPENDENCIES=    @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la
 LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
 mysqld_LDADD =          libndb.la \

=== modified file 'storage/archive/Makefile.am'
--- a/storage/archive/Makefile.am	2010-09-27 13:27:47 +0000
+++ b/storage/archive/Makefile.am	2010-11-12 18:14:54 +0000
@@ -42,24 +42,24 @@ ha_archive_la_SOURCES =	ha_archive.cc az
 
 
 noinst_LTLIBRARIES =    @plugin_archive_static_target@
-libarchive_la_CXXFLAGS =        $(AM_CXXFLAGS) @plugin_static_if_no_embedded@
-libarchive_la_CFLAGS =  $(AM_CFLAGS) @plugin_static_if_no_embedded@
+libarchive_la_CXXFLAGS =        $(AM_CXXFLAGS)
+libarchive_la_CFLAGS =  $(AM_CFLAGS)
 libarchive_la_SOURCES = ha_archive.cc azio.c
 
 
 archive_test_SOURCES =  archive_test.c azio.c
 archive_test_CFLAGS =   $(AM_CFLAGS)
-archive_test_LDADD =    $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la \
+archive_test_LDADD =    $(top_builddir)/mysys/libmysys.a \
+                        $(top_builddir)/dbug/libdbug.a \
+                        $(top_builddir)/strings/libmystrings.a \
                         @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.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la \
+archive_reader_LDADD =  $(top_builddir)/mysys/libmysys.a \
+                        $(top_builddir)/dbug/libdbug.a \
+                        $(top_builddir)/strings/libmystrings.a \
                         @ZLIB_LIBS@
 archive_reader_LDFLAGS = @NOINST_LDFLAGS@
 

=== modified file 'storage/blackhole/Makefile.am'
--- a/storage/blackhole/Makefile.am	2010-09-27 13:27:47 +0000
+++ b/storage/blackhole/Makefile.am	2010-11-12 18:14:54 +0000
@@ -40,7 +40,7 @@ ha_blackhole_la_SOURCES=ha_blackhole.cc
 
 
 noinst_LTLIBRARIES =    @plugin_blackhole_static_target@
-libblackhole_la_CXXFLAGS=$(AM_CXXFLAGS)  @plugin_static_if_no_embedded@
+libblackhole_la_CXXFLAGS=$(AM_CXXFLAGS)
 libblackhole_la_SOURCES=        ha_blackhole.cc
 
 

=== modified file 'storage/csv/Makefile.am'
--- a/storage/csv/Makefile.am	2010-09-27 13:27:47 +0000
+++ b/storage/csv/Makefile.am	2010-11-12 18:14:54 +0000
@@ -36,7 +36,7 @@ ha_csv_la_CXXFLAGS =	-shared $(AM_CXXFLA
 ha_csv_la_SOURCES =     transparent_file.cc ha_tina.cc 
 
 noinst_LTLIBRARIES =    @plugin_csv_static_target@
-libcsv_la_CXXFLAGS =    $(AM_CXXFLAGS)  @plugin_static_if_no_embedded@
+libcsv_la_CXXFLAGS =    $(AM_CXXFLAGS)
 libcsv_la_SOURCES =     transparent_file.cc ha_tina.cc
 
 EXTRA_DIST =            CMakeLists.txt plug.in

=== modified file 'storage/example/Makefile.am'
--- a/storage/example/Makefile.am	2010-09-27 13:27:47 +0000
+++ b/storage/example/Makefile.am	2010-11-12 18:14:54 +0000
@@ -40,7 +40,7 @@ ha_example_la_SOURCES =	ha_example.cc
 
 
 noinst_LTLIBRARIES =    @plugin_example_static_target@
-libexample_la_CXXFLAGS =        $(AM_CXXFLAGS)  @plugin_static_if_no_embedded@
+libexample_la_CXXFLAGS =        $(AM_CXXFLAGS)
 libexample_la_SOURCES=  ha_example.cc
 
 

=== modified file 'storage/federated/Makefile.am'
--- a/storage/federated/Makefile.am	2010-09-27 13:27:47 +0000
+++ b/storage/federated/Makefile.am	2010-11-12 18:14:54 +0000
@@ -39,7 +39,7 @@ ha_federated_la_SOURCES =	ha_federated.c
 
 
 noinst_LTLIBRARIES =    @plugin_federated_static_target@ @plugin_federated_embedded_static_target@
-libfederated_la_CXXFLAGS =      $(AM_CXXFLAGS) @plugin_static_if_no_embedded@
+libfederated_la_CXXFLAGS =      $(AM_CXXFLAGS)
 libfederated_la_SOURCES=        ha_federated.cc
 
 libfederated_embedded_la_CXXFLAGS =     $(AM_CXXFLAGS) @plugin_embedded_defs@

=== modified file 'storage/federatedx/Makefile.am'
--- a/storage/federatedx/Makefile.am	2010-09-27 13:27:47 +0000
+++ b/storage/federatedx/Makefile.am	2010-11-12 18:14:54 +0000
@@ -25,20 +25,20 @@ ha_federatedx_la_CFLAGS =	-shared $(AM_C
 
 
 noinst_LTLIBRARIES =    @plugin_federatedx_static_target@ @plugin_federatedx_embedded_static_target@
-libfederatedx_common_la_CXXFLAGS =      $(AM_CXXFLAGS) @plugin_static_if_no_embedded@
-libfederatedx_common_la_CFLAGS =        $(AM_CFLAGS) @plugin_static_if_no_embedded@
+libfederatedx_common_la_CXXFLAGS =      $(AM_CXXFLAGS)
+libfederatedx_common_la_CFLAGS =        $(AM_CFLAGS)
 libfederatedx_common_la_SOURCES=        federatedx_txn.cc \
                                 federatedx_io.cc federatedx_io_null.cc \
                                 federatedx_io_mysql.cc
 
-libfederatedx_la_CXXFLAGS =     $(AM_CFLAGS) @plugin_static_if_no_embedded@
-libfederatedx_la_CFLAGS =       $(AM_CFLAGS) @plugin_static_if_no_embedded@
+libfederatedx_la_CXXFLAGS =     $(AM_CFLAGS)
+libfederatedx_la_CFLAGS =       $(AM_CFLAGS)
 libfederatedx_la_LIBADD =       libfederatedx_common.la
 libfederatedx_la_SOURCES=       ha_federatedx.cc
 
 libfederatedx_embedded_la_CXXFLAGS =    $(AM_CFLAGS) @plugin_embedded_defs@
 libfederatedx_embedded_la_CFLAGS =      $(AM_CFLAGS) @plugin_embedded_defs@
-libfederatedx_embedded_la_LDFLAGS =     $(AM_LDFLAGS) @plugin_static_if_no_embedded@
+libfederatedx_embedded_la_LDFLAGS =     $(AM_LDFLAGS)
 libfederatedx_embedded_la_LIBADD =      libfederatedx_common.la
 libfederatedx_embedded_la_SOURCES=      ha_federatedx.cc
 

=== modified file 'storage/heap/Makefile.am'
--- a/storage/heap/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/heap/Makefile.am	2010-11-12 18:14:54 +0000
@@ -26,41 +26,40 @@ WRAPLIBS=
 LDADD =
 
 DEFS =                  @DEFS@
-pkglib_LTLIBRARIES =    libheap.la
-noinst_LTLIBRARIES =    libheap_s.la libheap_common.la \
+pkglib_LIBRARIES =      libheap.a
+noinst_LTLIBRARIES =    libheap.la libheap_s.la \
                         @plugin_heap_embedded_static_target@
 EXTRA_LTLIBRARIES =     libheap_embedded.la
 
 noinst_PROGRAMS =       hp_test1 hp_test2
 hp_test1_LDFLAGS = @NOINST_LDFLAGS@
-hp_test1_LDADD =        libheap.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la
+hp_test1_LDADD =        libheap.a \
+                        $(top_builddir)/mysys/libmysys.a \
+                        $(top_builddir)/dbug/libdbug.a \
+                        $(top_builddir)/strings/libmystrings.a
 hp_test2_LDFLAGS = @NOINST_LDFLAGS@
-hp_test2_LDADD =        libheap.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la
+hp_test2_LDADD =        libheap.a \
+                        $(top_builddir)/mysys/libmysys.a \
+                        $(top_builddir)/dbug/libdbug.a \
+                        $(top_builddir)/strings/libmystrings.a
 noinst_HEADERS =        heapdef.h ha_heap.h
-libheap_common_la_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_common_la_CFLAGS =      $(AM_LDFLAGS) @plugin_static_if_no_embedded@
 
 libheap_s_la_SOURCES =  ha_heap.cc
-libheap_s_la_CFLAGS =   $(AM_CFLAGS) @plugin_static_if_no_embedded@
-libheap_s_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_static_if_no_embedded@
-libheap_s_la_LIBADD =   libheap_common.la
+libheap_s_la_CFLAGS =   $(AM_CFLAGS)
+libheap_s_la_CXXFLAGS = $(AM_CXXFLAGS)
+libheap_s_la_LIBADD =   libheap.la
 libheap_embedded_la_SOURCES =   ha_heap.cc
-libheap_embedded_la_LIBADD =    libheap_common.la
+libheap_embedded_la_LIBADD =    libheap.la
 libheap_embedded_la_CXXFLAGS =  @plugin_embedded_defs@
-libheap_la_SOURCES =    
-libheap_la_LIBADD =     libheap_s.la
-libheap_la_LDFLAGS =    -static
+
+libheap.a: libheap.la
+        $(CP) .libs/libheap.a $@
 
 
 EXTRA_DIST =            CMakeLists.txt plug.in

=== modified file 'storage/innobase/Makefile.am'
--- a/storage/innobase/Makefile.am	2010-09-27 13:27:47 +0000
+++ b/storage/innobase/Makefile.am	2010-11-12 18:14:54 +0000
@@ -155,8 +155,8 @@ libinnobase_la_SOURCES=	btr/btr0btr.c bt
                         ut/ut0ut.c ut/ut0vec.c ut/ut0wqueue.c           \
                         handler/ha_innodb.cc
 
-libinnobase_la_CXXFLAGS=        $(AM_CXXFLAGS) @plugin_static_if_no_embedded@
-libinnobase_la_CFLAGS=  $(AM_CFLAGS) @plugin_static_if_no_embedded@
+libinnobase_la_CXXFLAGS=        $(AM_CXXFLAGS)
+libinnobase_la_CFLAGS=  $(AM_CFLAGS)
 
 EXTRA_LTLIBRARIES=      libinnobase.la ha_innodb.la
 pkgplugin_LTLIBRARIES=  @plugin_innobase_shared_target@

=== modified file 'storage/innodb_plugin/Makefile.am'
--- a/storage/innodb_plugin/Makefile.am	2010-09-27 13:27:47 +0000
+++ b/storage/innodb_plugin/Makefile.am	2010-11-12 18:14:54 +0000
@@ -324,8 +324,8 @@ libinnobase_la_SOURCES=	\
                         ut/ut0vec.c                     \
                         ut/ut0wqueue.c
 
-libinnobase_la_CXXFLAGS=        $(AM_CXXFLAGS) @plugin_static_if_no_embedded@
-libinnobase_la_CFLAGS=  $(AM_CFLAGS) @plugin_static_if_no_embedded@
+libinnobase_la_CXXFLAGS=        $(AM_CXXFLAGS)
+libinnobase_la_CFLAGS=  $(AM_CFLAGS)
 
 EXTRA_LTLIBRARIES=      libinnobase.la ha_innodb_plugin.la
 pkgplugin_LTLIBRARIES=  @plugin_innodb_plugin_shared_target@

=== modified file 'storage/maria/Makefile.am'
--- a/storage/maria/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/maria/Makefile.am	2010-11-12 18:14:54 +0000
@@ -33,39 +33,39 @@ SUBDIRS =		. unittest
 EXTRA_DIST =            ma_test_all.sh ma_test_all.res ma_test_big.sh \
                         ma_ft_stem.c CMakeLists.txt plug.in ma_test_recovery
 pkgdata_DATA =          
-pkglib_LTLIBRARIES =    libmaria.la
-noinst_LTLIBRARIES =    libmaria_common.la libmaria_s.la \
+pkglib_LIBRARIES =      libmaria.a
+noinst_LTLIBRARIES =    libmaria.la libmaria_s.la \
                         @plugin_maria_embedded_static_target@
 EXTRA_LTLIBRARIES =     libmaria_embedded.la
 bin_PROGRAMS =          maria_chk maria_pack maria_ftdump maria_read_log \
                         maria_dump_log
-maria_chk_DEPENDENCIES= $(LTLIBRARIES)
-# Only reason to link with libmyisam.la here is that it's where some fulltext
+maria_chk_DEPENDENCIES= $(LIBRARIES)
+# Only reason to link with libmyisam.a here is that it's where some fulltext
 # pieces are (but soon we'll remove fulltext dependencies from Maria).
 # For now, it imposes that storage/myisam be built before storage/maria.
-maria_chk_LDADD=                @CLIENT_EXTRA_LDFLAGS@ libmaria.la \
-                        $(top_builddir)/storage/myisam/libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
-maria_pack_DEPENDENCIES=$(LTLIBRARIES)
-maria_pack_LDADD=               @CLIENT_EXTRA_LDFLAGS@ libmaria.la \
-                        $(top_builddir)/storage/myisam/libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
-maria_read_log_DEPENDENCIES=$(LTLIBRARIES)
-maria_read_log_LDADD=           @CLIENT_EXTRA_LDFLAGS@ libmaria.la \
-                        $(top_builddir)/storage/myisam/libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
-maria_dump_log_DEPENDENCIES=$(LTLIBRARIES) ma_loghandler.c
-maria_dump_log_LDADD=           @CLIENT_EXTRA_LDFLAGS@ libmaria.la \
-                        $(top_builddir)/storage/myisam/libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
+maria_chk_LDADD=                @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+                        $(top_builddir)/storage/myisam/libmyisam.a \
+                        $(top_builddir)/mysys/libmysys.a \
+                        $(top_builddir)/dbug/libdbug.a \
+                        $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+maria_pack_DEPENDENCIES=$(LIBRARIES)
+maria_pack_LDADD=               @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+                        $(top_builddir)/storage/myisam/libmyisam.a \
+                        $(top_builddir)/mysys/libmysys.a \
+                        $(top_builddir)/dbug/libdbug.a \
+                        $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+maria_read_log_DEPENDENCIES=$(LIBRARIES)
+maria_read_log_LDADD=           @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+                        $(top_builddir)/storage/myisam/libmyisam.a \
+                        $(top_builddir)/mysys/libmysys.a \
+                        $(top_builddir)/dbug/libdbug.a \
+                        $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+maria_dump_log_DEPENDENCIES=$(LIBRARIES) ma_loghandler.c
+maria_dump_log_LDADD=           @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+                        $(top_builddir)/storage/myisam/libmyisam.a \
+                        $(top_builddir)/mysys/libmysys.a \
+                        $(top_builddir)/dbug/libdbug.a \
+                        $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
 maria_dump_log_SOURCES= ma_loghandler.c unittest/ma_loghandler_examples.c
 maria_dump_log_CPPFLAGS= -DMARIA_DUMP_LOG
 noinst_PROGRAMS =       ma_test1 ma_test2 ma_test3 ma_rt_test ma_sp_test
@@ -77,45 +77,45 @@ noinst_HEADERS =	maria_def.h ma_rt_index
                         ma_checkpoint.h ma_recovery.h ma_commit.h ma_state.h \
                         trnman_public.h ma_check_standalone.h \
                         ma_key_recover.h ma_recovery_util.h
-ma_test1_DEPENDENCIES=  $(LTLIBRARIES)
-ma_test1_LDADD=         @CLIENT_EXTRA_LDFLAGS@ libmaria.la \
-                        $(top_builddir)/storage/myisam/libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
-ma_test2_DEPENDENCIES=  $(LTLIBRARIES)
-ma_test2_LDADD=         @CLIENT_EXTRA_LDFLAGS@ libmaria.la \
-                        $(top_builddir)/storage/myisam/libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
-ma_test3_DEPENDENCIES=  $(LTLIBRARIES)
-ma_test3_LDADD=         @CLIENT_EXTRA_LDFLAGS@ libmaria.la \
-                        $(top_builddir)/storage/myisam/libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
-#ma_ft_test1_DEPENDENCIES=      $(LTLIBRARIES)
-#ma_ft_eval_DEPENDENCIES=       $(LTLIBRARIES)
-maria_ftdump_DEPENDENCIES=      $(LTLIBRARIES)
-maria_ftdump_LDADD=             @CLIENT_EXTRA_LDFLAGS@ libmaria.la \
-                        $(top_builddir)/storage/myisam/libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
-ma_rt_test_DEPENDENCIES=        $(LTLIBRARIES)
-ma_rt_test_LDADD=               @CLIENT_EXTRA_LDFLAGS@ libmaria.la \
-                        $(top_builddir)/storage/myisam/libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
-ma_sp_test_DEPENDENCIES=        $(LTLIBRARIES)
-ma_sp_test_LDADD=               @CLIENT_EXTRA_LDFLAGS@ libmaria.la \
-                        $(top_builddir)/storage/myisam/libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
-libmaria_common_la_SOURCES =    ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c \
+ma_test1_DEPENDENCIES=  $(LIBRARIES)
+ma_test1_LDADD=         @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+                        $(top_builddir)/storage/myisam/libmyisam.a \
+                        $(top_builddir)/mysys/libmysys.a \
+                        $(top_builddir)/dbug/libdbug.a \
+                        $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+ma_test2_DEPENDENCIES=  $(LIBRARIES)
+ma_test2_LDADD=         @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+                        $(top_builddir)/storage/myisam/libmyisam.a \
+                        $(top_builddir)/mysys/libmysys.a \
+                        $(top_builddir)/dbug/libdbug.a \
+                        $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+ma_test3_DEPENDENCIES=  $(LIBRARIES)
+ma_test3_LDADD=         @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+                        $(top_builddir)/storage/myisam/libmyisam.a \
+                        $(top_builddir)/mysys/libmysys.a \
+                        $(top_builddir)/dbug/libdbug.a \
+                        $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+#ma_ft_test1_DEPENDENCIES=      $(LIBRARIES)
+#ma_ft_eval_DEPENDENCIES=       $(LIBRARIES)
+maria_ftdump_DEPENDENCIES=      $(LIBRARIES)
+maria_ftdump_LDADD=             @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+                        $(top_builddir)/storage/myisam/libmyisam.a \
+                        $(top_builddir)/mysys/libmysys.a \
+                        $(top_builddir)/dbug/libdbug.a \
+                        $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+ma_rt_test_DEPENDENCIES=        $(LIBRARIES)
+ma_rt_test_LDADD=               @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+                        $(top_builddir)/storage/myisam/libmyisam.a \
+                        $(top_builddir)/mysys/libmysys.a \
+                        $(top_builddir)/dbug/libdbug.a \
+                        $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+ma_sp_test_DEPENDENCIES=        $(LIBRARIES)
+ma_sp_test_LDADD=               @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
+                        $(top_builddir)/storage/myisam/libmyisam.a \
+                        $(top_builddir)/mysys/libmysys.a \
+                        $(top_builddir)/dbug/libdbug.a \
+                        $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
+libmaria_la_SOURCES =   ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c \
                         ma_rnext.c ma_rnext_same.c \
                         ma_search.c ma_page.c ma_key_recover.c ma_key.c \
                         ma_locking.c ma_state.c \
@@ -138,20 +138,17 @@ libmaria_common_la_SOURCES =	ma_init.c m
                         ma_pagecache.c ma_pagecaches.c \
                         ma_checkpoint.c ma_recovery.c ma_commit.c \
                         ma_pagecrc.c ma_recovery_util.c
-libmaria_common_la_CFLAGS =     $(AM_CFLAGS) @plugin_static_if_no_embedded@
 
 libmaria_s_la_SOURCES = ha_maria.cc
-libmaria_s_la_CXXFLAGS =        $(AM_CXXFLAGS) @plugin_static_if_no_embedded@
-libmaria_s_la_LIBADD =  libmaria_common.la
+libmaria_s_la_CXXFLAGS =        $(AM_CXXFLAGS)
+libmaria_s_la_LIBADD =  libmaria.la
 libmaria_embedded_la_SOURCES =  ha_maria.cc
-libmaria_embedded_la_LIBADD =   libmaria_common.la
-libmaria_embedded_la_CXXFLAGS = @plugin_embedded_defs@
+libmaria_embedded_la_LIBADD =   libmaria.la
+libmaria_embedded_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_embedded_defs@
+
+libmaria.a: libmaria.la
+        $(CP) .libs/libmaria.a $@
 
-# Static-only library for installation and linking into binaries.
-# (Dynamic does not work well due to unresolved references into mysqld)
-libmaria_la_LDFLAGS =   -static
-libmaria_la_SOURCES =   
-libmaria_la_LIBADD =    libmaria_s.la
 
 CLEANFILES =            test?.MA? FT?.MA? isam.log ma_test_all ma_rt_test.MA? sp_test.MA? maria_log_control maria_log.0000*
 

=== modified file 'storage/maria/unittest/Makefile.am'
--- a/storage/maria/unittest/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/maria/unittest/Makefile.am	2010-11-12 18:14:54 +0000
@@ -19,14 +19,14 @@ INCLUDES         = @ZLIB_INCLUDES@ -I$(t
                   -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
 EXTRA_DIST=     ma_test_all-t CMakeLists.txt \
                 ma_test_recovery.pl ma_test_recovery.expected
-# Only reason to link with libmyisam.la here is that it's where some fulltext
+# Only reason to link with libmyisam.a here is that it's where some fulltext
 # pieces are (but soon we'll remove fulltext dependencies from Maria).
 LDADD=                  $(top_builddir)/unittest/mytap/libmytap.a \
-                        $(top_builddir)/storage/maria/libmaria.la \
-                        $(top_builddir)/storage/myisam/libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
+                        $(top_builddir)/storage/maria/libmaria.a \
+                        $(top_builddir)/storage/myisam/libmyisam.a \
+                        $(top_builddir)/mysys/libmysys.a \
+                        $(top_builddir)/dbug/libdbug.a \
+                        $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
 noinst_PROGRAMS =       ma_control_file-t trnman-t \
                         ma_pagecache_single_1k-t ma_pagecache_single_8k-t \
                         ma_pagecache_single_64k-t \

=== modified file 'storage/myisam/Makefile.am'
--- a/storage/myisam/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/myisam/Makefile.am	2010-11-12 18:14:54 +0000
@@ -30,65 +30,65 @@ DEFS =                  @DEFS@
 EXTRA_DIST =            mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt plug.in
 pkgdata_DATA =          
 
-pkglib_LTLIBRARIES =    libmyisam.la
-noinst_LTLIBRARIES =    libmyisam_common.la libmyisam_s.la \
+pkglib_LIBRARIES =      libmyisam.a
+noinst_LTLIBRARIES =    libmyisam.la libmyisam_s.la \
                         @plugin_myisam_embedded_static_target@
 EXTRA_LTLIBRARIES =     libmyisam_embedded.la
 
 bin_PROGRAMS =          myisamchk myisamlog myisampack myisam_ftdump
-myisamchk_DEPENDENCIES= $(LTLIBRARIES)
-myisamchk_LDADD=        @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
-myisamlog_DEPENDENCIES= $(LTLIBRARIES)
-myisamlog_LDADD=        @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
-myisampack_DEPENDENCIES=$(LTLIBRARIES)
-myisampack_LDADD=       @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
+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@
+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@
+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@
 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=  $(LTLIBRARIES)
-mi_test1_LDADD=         @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
-mi_test2_DEPENDENCIES=  $(LTLIBRARIES)
-mi_test2_LDADD=         @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
-mi_test3_DEPENDENCIES=  $(LTLIBRARIES)
-mi_test3_LDADD=         @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
-#ft_test1_DEPENDENCIES= $(LTLIBRARIES)
-#ft_eval_DEPENDENCIES=  $(LTLIBRARIES)
-myisam_ftdump_DEPENDENCIES=     $(LTLIBRARIES)
-myisam_ftdump_LDADD =                   @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
-rt_test_DEPENDENCIES=   $(LTLIBRARIES)
-rt_test_LDADD =                 @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
-sp_test_DEPENDENCIES=   $(LTLIBRARIES)
-sp_test_LDADD =                 @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
-                        $(top_builddir)/mysys/libmysys.la \
-                        $(top_builddir)/dbug/libdbug.la \
-                        $(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
+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@
+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@
+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@
+#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@
+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@
+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@
 
-libmyisam_common_la_SOURCES =   mi_open.c mi_extra.c mi_info.c mi_rkey.c \
+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 \
@@ -105,21 +105,15 @@ libmyisam_common_la_SOURCES =	mi_open.c 
                         ft_update.c ft_boolean_search.c ft_nlq_search.c \
                         sort.c ft_myisam.c \
                         rt_index.c rt_key.c rt_mbr.c rt_split.c sp_key.c
-libmyisam_common_la_CFLAGS =    $(AM_CFLAGS) @plugin_static_if_no_embedded@
 libmyisam_s_la_SOURCES =        ha_myisam.cc
-libmyisam_s_la_CXXFLAGS =       $(AM_CXXFLAGS) @plugin_static_if_no_embedded@
-libmyisam_s_la_LIBADD = libmyisam_common.la
+libmyisam_s_la_CXXFLAGS =       $(AM_CXXFLAGS)
+libmyisam_s_la_LIBADD = libmyisam.la
 libmyisam_embedded_la_SOURCES = ha_myisam.cc
-libmyisam_embedded_la_LIBADD =  libmyisam_common.la
 libmyisam_embedded_la_CXXFLAGS =        $(AM_CXXFLAGS) @plugin_embedded_defs@
-# libmyisam  references symbols inside mysqld.
-# This means we cannot use it as shared library, as these references causes
-# undefined symbol errors at load time.
-# But a static library works (as long as those parts that references
-# problematic symbols are not linked).
-libmyisam_la_LDFLAGS =  -static
-libmyisam_la_SOURCES =  
-libmyisam_la_LIBADD =   libmyisam_s.la
+libmyisam_embedded_la_LIBADD =  libmyisam.la
+
+libmyisam.a: libmyisam.la
+        $(CP) .libs/libmyisam.a $@
 
 CLEANFILES =            test?.MY? FT?.MY? isam.log mi_test_all rt_test.MY? sp_test.MY?
 

=== modified file 'storage/myisammrg/Makefile.am'
--- a/storage/myisammrg/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/myisammrg/Makefile.am	2010-11-12 18:14:54 +0000
@@ -26,30 +26,26 @@ WRAPLIBS=
 LDADD =
 
 DEFS =                  @DEFS@
-pkglib_LTLIBRARIES =    libmyisammrg.la
-noinst_LTLIBRARIES =    libmyisammrg_s.la libmyisammrg_common.la \
+pkglib_LIBRARIES =      libmyisammrg.a
+noinst_LTLIBRARIES =    libmyisammrg.la libmyisammrg_s.la \
                         @plugin_myisammrg_embedded_static_target@
 EXTRA_LTLIBRARIES =     libmyisammrg_embedded.la
 noinst_HEADERS =        myrg_def.h ha_myisammrg.h
-libmyisammrg_common_la_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 myrg_records.c
-libmyisammrg_common_la_CFLAGS = $(AM_CFLAGS) @plugin_static_if_no_embedded@
 libmyisammrg_s_la_SOURCES = ha_myisammrg.cc
-libmyisammrg_s_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_static_if_no_embedded@
-libmyisammrg_s_la_LIBADD = libmyisammrg_common.la
+libmyisammrg_s_la_CXXFLAGS = $(AM_CXXFLAGS)
+libmyisammrg_s_la_LIBADD = libmyisammrg.la
 libmyisammrg_embedded_la_SOURCES = ha_myisammrg.cc
-libmyisammrg_embedded_la_CFLAGS = $(AM_CFLAGS) @plugin_embedded_defs@
-libmyisammrg_embedded_la_LIBADD = libmyisammrg_common.la
 libmyisammrg_embedded_la_CXXFLAGS =     $(AM_CXXFLAGS) @plugin_embedded_defs@
-libmyisammrg_la_SOURCES =       
-libmyisammrg_la_LIBADD =        libmyisammrg_s.la
-libmyisammrg_la_LDFLAGS =       -static
-
+libmyisammrg_embedded_la_LIBADD = libmyisammrg.la
 
+libmyisammrg.a: libmyisammrg.la
+        $(CP) .libs/libmyisammrg.a $@
 
 EXTRA_DIST =            CMakeLists.txt plug.in
 

=== modified file 'storage/ndb/config/type_ndbapitest.mk.am'
--- a/storage/ndb/config/type_ndbapitest.mk.am	2010-09-28 13:07:42 +0000
+++ b/storage/ndb/config/type_ndbapitest.mk.am	2010-11-12 18:14:54 +0000
@@ -15,9 +15,9 @@
 
 LDADD += $(top_builddir)/storage/ndb/test/src/libNDBT.a \
          $(top_builddir)/storage/ndb/src/libndbclient.la \
-         $(top_builddir)/dbug/libdbug.la \
-         $(top_builddir)/mysys/libmysys.la \
-         $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@
+         $(top_builddir)/dbug/libdbug.a \
+         $(top_builddir)/mysys/libmysys.a \
+         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
 
 INCLUDES += -I$(top_srcdir) \
         -I$(top_builddir)/include \

=== modified file 'storage/ndb/config/type_ndbapitools.mk.am'
--- a/storage/ndb/config/type_ndbapitools.mk.am	2010-09-27 11:28:40 +0000
+++ b/storage/ndb/config/type_ndbapitools.mk.am	2010-11-12 18:14:54 +0000
@@ -15,9 +15,9 @@
 
 LDADD += \
          $(top_builddir)/storage/ndb/src/libndbclient.la \
-         $(top_builddir)/dbug/libdbug.la \
-         $(top_builddir)/mysys/libmysys.la \
-         $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ @ZLIB_LIBS@
+         $(top_builddir)/dbug/libdbug.a \
+         $(top_builddir)/mysys/libmysys.a \
+         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ @ZLIB_LIBS@
 
 INCLUDES += -I$(srcdir) \
         -I$(top_builddir)/include \

=== modified file 'storage/ndb/config/win-libraries'
--- a/storage/ndb/config/win-libraries	2010-09-27 11:28:40 +0000
+++ b/storage/ndb/config/win-libraries	2010-11-12 18:14:54 +0000
@@ -21,7 +21,7 @@ do
 # the same goes for mysys and strings
   lib=$i
   case $i in
-  *libdbug.la | *libmysys.la | *libmystrings.la) 
+  *libdbug.a | *libmysys.a | *libmystrings.a) 
   lib=`echo $i | sed s'!dbug\/lib!!' | sed 's!mysys\/lib!!' | sed 's!strings\/libmy!!'`
   echo "Changing from $i to $lib"
   ;;

=== modified file 'storage/ndb/src/common/util/Makefile.am'
--- a/storage/ndb/src/common/util/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/ndb/src/common/util/Makefile.am	2010-11-12 18:14:54 +0000
@@ -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.la \
-         $(top_builddir)/mysys/libmysys.la \
-         $(top_builddir)/strings/libmystrings.la
+         $(top_builddir)/dbug/libdbug.a \
+         $(top_builddir)/mysys/libmysys.a \
+         $(top_builddir)/strings/libmystrings.a
 
 testBitmask.cpp : Bitmask.cpp
         rm -f testBitmask.cpp

=== modified file 'storage/ndb/src/cw/cpcd/Makefile.am'
--- a/storage/ndb/src/cw/cpcd/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/ndb/src/cw/cpcd/Makefile.am	2010-11-12 18:14:54 +0000
@@ -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.la \
-            $(top_builddir)/mysys/libmysys.la \
-            $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@
+            $(top_builddir)/dbug/libdbug.a \
+            $(top_builddir)/mysys/libmysys.a \
+            $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_util.mk.am

=== modified file 'storage/ndb/src/kernel/Makefile.am'
--- a/storage/ndb/src/kernel/Makefile.am	2010-09-28 13:07:42 +0000
+++ b/storage/ndb/src/kernel/Makefile.am	2010-11-12 18:14:54 +0000
@@ -53,9 +53,9 @@ 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.la \
-         $(top_builddir)/mysys/libmysys.la \
-         $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@
+         $(top_builddir)/dbug/libdbug.a \
+         $(top_builddir)/mysys/libmysys.a \
+         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
 
 windoze-dsp: ndbd.dsp
 

=== modified file 'storage/ndb/src/kernel/blocks/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/ndb/src/kernel/blocks/Makefile.am	2010-11-12 18:14:54 +0000
@@ -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.la \
-         $(top_builddir)/mysys/libmysys.la \
-         $(top_builddir)/strings/libmystrings.la
+         $(top_builddir)/dbug/libdbug.a \
+         $(top_builddir)/mysys/libmysys.a \
+         $(top_builddir)/strings/libmystrings.a
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am

=== modified file 'storage/ndb/src/kernel/blocks/backup/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/backup/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/ndb/src/kernel/blocks/backup/Makefile.am	2010-11-12 18:14:54 +0000
@@ -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.la \
-         $(top_builddir)/dbug/libdbug.la \
-         $(top_builddir)/strings/libmystrings.la
+         $(top_builddir)/mysys/libmysys.a \
+         $(top_builddir)/dbug/libdbug.a \
+         $(top_builddir)/strings/libmystrings.a
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am

=== modified file 'storage/ndb/src/kernel/blocks/dbdict/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dbdict/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdict/Makefile.am	2010-11-12 18:14:54 +0000
@@ -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.la \
-         $(top_builddir)/mysys/libmysys.la \
-         $(top_builddir)/strings/libmystrings.la
+         $(top_builddir)/dbug/libdbug.a \
+         $(top_builddir)/mysys/libmysys.a \
+         $(top_builddir)/strings/libmystrings.a
 
 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.la \
-         $(top_builddir)/mysys/libmysys.la \
-         $(top_builddir)/strings/libmystrings.la
+         $(top_builddir)/dbug/libdbug.a \
+         $(top_builddir)/mysys/libmysys.a \
+         $(top_builddir)/strings/libmystrings.a
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

=== modified file 'storage/ndb/src/kernel/blocks/dbdih/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dbdih/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/Makefile.am	2010-11-12 18:14:54 +0000
@@ -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.la \
-         $(top_builddir)/mysys/libmysys.la \
-         $(top_builddir)/strings/libmystrings.la
+         $(top_builddir)/dbug/libdbug.a \
+         $(top_builddir)/mysys/libmysys.a \
+         $(top_builddir)/strings/libmystrings.a
 
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2010-11-12 18:14:54 +0000
@@ -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.la \
-         $(top_builddir)/mysys/libmysys.la \
-         $(top_builddir)/strings/libmystrings.la
+         $(top_builddir)/dbug/libdbug.a \
+         $(top_builddir)/mysys/libmysys.a \
+         $(top_builddir)/strings/libmystrings.a
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

=== modified file 'storage/ndb/src/kernel/blocks/dbtup/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dbtup/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am	2010-11-12 18:14:54 +0000
@@ -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.la \
-  $(top_builddir)/dbug/libdbug.la \
-  $(top_builddir)/strings/libmystrings.la
+  $(top_builddir)/mysys/libmysys.a \
+  $(top_builddir)/dbug/libdbug.a \
+  $(top_builddir)/strings/libmystrings.a
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

=== modified file 'storage/ndb/src/kernel/vm/Makefile.am'
--- a/storage/ndb/src/kernel/vm/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/ndb/src/kernel/vm/Makefile.am	2010-11-12 18:14:54 +0000
@@ -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.la \
-  $(top_builddir)/dbug/libdbug.la \
-  $(top_builddir)/strings/libmystrings.la
+  $(top_builddir)/mysys/libmysys.a \
+  $(top_builddir)/dbug/libdbug.a \
+  $(top_builddir)/strings/libmystrings.a
 
 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.la \
-  $(top_builddir)/dbug/libdbug.la \
-  $(top_builddir)/strings/libmystrings.la
+  $(top_builddir)/mysys/libmysys.a \
+  $(top_builddir)/dbug/libdbug.a \
+  $(top_builddir)/strings/libmystrings.a
 
 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.la \
-  $(top_builddir)/dbug/libdbug.la \
-  $(top_builddir)/strings/libmystrings.la
+  $(top_builddir)/mysys/libmysys.a \
+  $(top_builddir)/dbug/libdbug.a \
+  $(top_builddir)/strings/libmystrings.a
 

=== modified file 'storage/ndb/src/mgmclient/Makefile.am'
--- a/storage/ndb/src/mgmclient/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/ndb/src/mgmclient/Makefile.am	2010-11-12 18:14:54 +0000
@@ -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.la \
-            $(top_builddir)/mysys/libmysys.la \
-            $(top_builddir)/strings/libmystrings.la \
+            $(top_builddir)/dbug/libdbug.a \
+            $(top_builddir)/mysys/libmysys.a \
+            $(top_builddir)/strings/libmystrings.a \
             @TERMCAP_LIB@ @NDB_SCI_LIBS@
 
 ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@

=== modified file 'storage/ndb/src/mgmsrv/Makefile.am'
--- a/storage/ndb/src/mgmsrv/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/ndb/src/mgmsrv/Makefile.am	2010-11-12 18:14:54 +0000
@@ -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.la \
-            $(top_builddir)/mysys/libmysys.la \
-            $(top_builddir)/strings/libmystrings.la \
+            $(top_builddir)/dbug/libdbug.a \
+            $(top_builddir)/mysys/libmysys.a \
+            $(top_builddir)/strings/libmystrings.a \
             @readline_link@ \
             @NDB_SCI_LIBS@ \
             @TERMCAP_LIB@

=== modified file 'storage/ndb/src/ndbapi/Makefile.am'
--- a/storage/ndb/src/ndbapi/Makefile.am	2010-09-28 13:07:42 +0000
+++ b/storage/ndb/src/ndbapi/Makefile.am	2010-11-12 18:14:54 +0000
@@ -67,9 +67,9 @@ include $(top_srcdir)/storage/ndb/config
 include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
 
 ndberror_check_LDFLAGS = \
-         $(top_builddir)/dbug/libdbug.la \
-         $(top_builddir)/mysys/libmysys.la \
-         $(top_builddir)/strings/libmystrings.la
+         $(top_builddir)/dbug/libdbug.a \
+         $(top_builddir)/mysys/libmysys.a \
+         $(top_builddir)/strings/libmystrings.a
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

=== modified file 'storage/ndb/test/run-test/Makefile.am'
--- a/storage/ndb/test/run-test/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/storage/ndb/test/run-test/Makefile.am	2010-11-12 18:14:54 +0000
@@ -34,9 +34,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.la \
-            $(top_builddir)/mysys/libmysys.la \
-            $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@
+            $(top_builddir)/dbug/libdbug.a \
+            $(top_builddir)/mysys/libmysys.a \
+            $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
 
 atrt_CXXFLAGS = -I$(top_srcdir)/ndb/src/mgmapi \
                       -I$(top_srcdir)/ndb/src/mgmsrv \

=== modified file 'storage/pbxt/src/Makefile.am'
--- a/storage/pbxt/src/Makefile.am	2010-11-12 12:15:18 +0000
+++ b/storage/pbxt/src/Makefile.am	2010-11-12 18:14:54 +0000
@@ -47,9 +47,7 @@ libpbxt_la_LDFLAGS =		-module 
 noinst_LTLIBRARIES =            libpbxt_s.la libpbxt_s_embedded.la libpbxt_s_common.la
 
 libpbxt_s_common_la_SOURCES =   $(non_mysql_internal_sources)
-libpbxt_s_common_la_CXXFLAGS =  @plugin_static_if_no_embedded@
 libpbxt_s_la_SOURCES =          $(mysql_internal_sources)
-libpbxt_s_la_CXXFLAGS =         @plugin_static_if_no_embedded@
 libpbxt_s_la_LIBADD =           libpbxt_s_common.la
 libpbxt_s_embedded_la_SOURCES = $(mysql_internal_sources)
 libpbxt_s_embedded_la_CXXFLAGS =        $(AM_CXXFLAGS) @plugin_embedded_defs@

=== modified file 'storage/xtradb/Makefile.am'
--- a/storage/xtradb/Makefile.am	2010-11-12 12:15:18 +0000
+++ b/storage/xtradb/Makefile.am	2010-11-12 18:14:54 +0000
@@ -325,8 +325,8 @@ libxtradb_la_SOURCES=	\
                         ut/ut0vec.c                     \
                         ut/ut0wqueue.c
 
-libxtradb_la_CXXFLAGS=  $(AM_CXXFLAGS) @plugin_static_if_no_embedded@
-libxtradb_la_CFLAGS=    $(AM_CFLAGS) @plugin_static_if_no_embedded@
+libxtradb_la_CXXFLAGS=  $(AM_CXXFLAGS)
+libxtradb_la_CFLAGS=    $(AM_CFLAGS)
 
 EXTRA_LTLIBRARIES=      libxtradb.la ha_xtradb.la
 pkgplugin_LTLIBRARIES=  @plugin_xtradb_shared_target@

=== modified file 'strings/Makefile.am'
--- a/strings/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/strings/Makefile.am	2010-11-12 18:14:54 +0000
@@ -16,7 +16,8 @@
 # This file is public domain and comes with NO WARRANTY of any kind
 
 INCLUDES =              -I$(top_builddir)/include -I$(top_srcdir)/include
-pkglib_LTLIBRARIES =    libmystrings.la
+pkglib_LIBRARIES =      libmystrings.a
+noinst_LTLIBRARIES =    libmystrings.la
 
 # Exact one of ASSEMBLER_X
 if ASSEMBLER_x86
@@ -58,8 +59,7 @@ EXTRA_DIST =		ctype-big5.c ctype-cp932.c
 
 libmystrings_la_LIBADD=
 conf_to_src_SOURCES =   conf_to_src.c
-conf_to_src_LDADD =     libmystrings.la
-
+conf_to_src_LDADD =     libmystrings.a
 #force static linking of conf_to_src - essential when linking against
 #custom installation of libc
 conf_to_src_LDFLAGS= @NOINST_LDFLAGS@
@@ -67,16 +67,18 @@ conf_to_src_LDFLAGS= @NOINST_LDFLAGS@
 # This is because the dependency tracking misses @FOO@ vars in sources.
 #strtoull.o:            @CHARSET_OBJS@
 
+libmystrings.a: libmystrings.la
+        $(CP) .libs/libmystrings.a $@
 
 FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
 
-str_test: str_test.c $(pkglib_LTLIBRARIES)
-        $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LTLIBRARIES)
+str_test: str_test.c $(pkglib_LIBRARIES)
+        $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LIBRARIES)
 
 uctypedump: uctypedump.c
         $(LINK) $(INCLUDES) $(srcdir)/uctypedump.c
 
 test_decimal$(EXEEXT): decimal.c $(pkglib_LIBRARIES)
         $(CP) $(srcdir)/decimal.c ./test_decimal.c
-        $(LINK) $(FLAGS) -DMAIN  ./test_decimal.c $(LDADD) $(pkglib_LTLIBRARIES)
+        $(LINK) $(FLAGS) -DMAIN  ./test_decimal.c $(LDADD) $(pkglib_LIBRARIES)
         $(RM) -f ./test_decimal.c

=== modified file 'unittest/mysys/Makefile.am'
--- a/unittest/mysys/Makefile.am	2010-09-28 13:07:42 +0000
+++ b/unittest/mysys/Makefile.am	2010-11-12 18:14:54 +0000
@@ -19,9 +19,9 @@ INCLUDES =		@ZLIB_INCLUDES@ -I$(top_buil
 noinst_HEADERS = thr_template.c
 
 LDADD           = $(top_builddir)/unittest/mytap/libmytap.a \
-                  $(top_builddir)/mysys/libmysys.la \
-                  $(top_builddir)/dbug/libdbug.la \
-                  $(top_builddir)/strings/libmystrings.la
+                  $(top_builddir)/mysys/libmysys.a \
+                  $(top_builddir)/dbug/libdbug.a \
+                  $(top_builddir)/strings/libmystrings.a
 
 EXTRA_DIST       = CMakeLists.txt 
 noinst_PROGRAMS  = bitmap-t base64-t my_atomic-t lf-t waiting_threads-t

=== modified file 'unittest/strings/Makefile.am'
--- a/unittest/strings/Makefile.am	2010-09-28 13:07:42 +0000
+++ b/unittest/strings/Makefile.am	2010-11-12 18:14:54 +0000
@@ -17,9 +17,9 @@ 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.la \
-                  $(top_builddir)/dbug/libdbug.la \
-                  $(top_builddir)/strings/libmystrings.la
+                  $(top_builddir)/mysys/libmysys.a \
+                  $(top_builddir)/dbug/libdbug.a \
+                  $(top_builddir)/strings/libmystrings.a
 
 noinst_PROGRAMS  = strings-t
 

=== modified file 'vio/Makefile.am'
--- a/vio/Makefile.am	2010-09-28 13:07:42 +0000
+++ b/vio/Makefile.am	2010-11-12 18:14:54 +0000
@@ -16,11 +16,15 @@
 INCLUDES =              -I$(top_builddir)/include -I$(top_srcdir)/include \
                         $(openssl_includes)
 LDADD =                 @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs)
-pkglib_LTLIBRARIES =    libvio.la
+pkglib_LIBRARIES =      libvio.a
+noinst_LTLIBRARIES =    libvio.la
 
 noinst_HEADERS =        vio_priv.h
 
 libvio_la_SOURCES =     vio.c viosocket.c viossl.c viosslfactories.c
-libvio_la_LIBADD =      $(openssl_libs) $(yassl_libs)
 
 EXTRA_DIST=             CMakeLists.txt
+
+libvio.a: libvio.la
+        $(CP) .libs/libvio.a $@
+



More information about the commits mailing list