[Commits] Rev 2928: MWL#74: libmysqld.so: some fixes and cleanup mainly related to cross-library references. in http://bazaar.launchpad.net/~maria-captains/maria/5.1

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Tue Sep 28 16:07:42 EEST 2010


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

------------------------------------------------------------
revno: 2928
revision-id: knielsen at knielsen-hq.org-20100928130742-foy9cs3e100wdn79
parent: knielsen at knielsen-hq.org-20100927132747-18z80qubmb93g49q
committer: knielsen at knielsen-hq.org
branch nick: work-5.1-mwl74
timestamp: Tue 2010-09-28 15:07:42 +0200
message:
  MWL#74: libmysqld.so: some fixes and cleanup mainly related to cross-library references.
=== modified file 'client/Makefile.am'
--- a/client/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/client/Makefile.am	2010-09-28 13:07:42 +0000
@@ -75,8 +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)/strings/libmystrings.la
+                                $(top_builddir)/mysys/libmysys.la
 
 mysqlshow_SOURCES=              mysqlshow.c
 
@@ -85,8 +84,7 @@ mysqlslap_CFLAGS=		-DTHREAD -UMYSQL_CLIE
 mysqlslap_LDADD =               $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
                                 @CLIENT_EXTRA_LDFLAGS@ \
                                 $(LIBMYSQLCLIENT_LA) \
-                                $(top_builddir)/mysys/libmysys.la \
-                                $(top_builddir)/strings/libmystrings.la
+                                $(top_builddir)/mysys/libmysys.la
 
 mysqltest_SOURCES=              mysqltest.cc
 mysqltest_CXXFLAGS=             -DTHREAD -UMYSQL_CLIENT_NO_THREADS
@@ -94,8 +92,7 @@ mysqltest_LDADD =		$(CXXLDFLAGS) $(CLIEN
                                 @CLIENT_EXTRA_LDFLAGS@ \
                                 $(LIBMYSQLCLIENT_LA) \
                                 $(top_builddir)/mysys/libmysys.la \
-                                $(top_builddir)/regex/libregex.la \
-                                $(top_builddir)/strings/libmystrings.la \
+                                $(top_builddir)/regex/libregex.la
                                 $(CLIENT_THREAD_LIBS)
 
 mysql_upgrade_SOURCES=          mysql_upgrade.c \

=== modified file 'dbug/Makefile.am'
--- a/dbug/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/dbug/Makefile.am	2010-09-28 13:07:42 +0000
@@ -16,7 +16,7 @@
 # MA 02111-1307, USA
 
 INCLUDES =              -I$(top_builddir)/include -I$(top_srcdir)/include
-LDADD =                 libdbug.la ../mysys/libmysys.la ../strings/libmystrings.la $(ZLIB_LIBS)
+LDADD =                 libdbug.la ../mysys/libmysys.la ../strings/libmystrings.la
 pkglib_LTLIBRARIES =    libdbug.la
 noinst_HEADERS =        dbug_long.h
 libdbug_la_SOURCES =    dbug.c sanity.c

=== modified file 'libmysqld/examples/Makefile.am'
--- a/libmysqld/examples/Makefile.am	2010-09-27 11:28:40 +0000
+++ b/libmysqld/examples/Makefile.am	2010-09-28 13:07:42 +0000
@@ -41,8 +41,7 @@ LDADD =		@CLIENT_EXTRA_LDFLAGS@ ../libmy
                 @ndbcluster_libs@ @NDB_SCI_LIBS@ \
                 $(top_builddir)/mysys/libmysys.la \
                 $(top_builddir)/strings/libmystrings.la \
-                $(top_builddir)/dbug/libdbug.la \
-                $(ZLIB_LIBS)
+                $(top_builddir)/dbug/libdbug.la
 
 mysqltest_embedded_LINK = $(CXXLINK)
 nodist_mysqltest_embedded_SOURCES =     mysqltest.cc

=== modified file 'mysys/Makefile.am'
--- a/mysys/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/mysys/Makefile.am	2010-09-28 13:07:42 +0000
@@ -57,6 +57,8 @@ libmysys_la_SOURCES =	my_init.c my_getwd
                         my_memmem.c stacktrace.c \
                         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)
 
 if NEED_THREAD
 # mf_keycache is used only in the server, so it is safe to leave the file

=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/sql/Makefile.am	2010-09-28 13:07:42 +0000
@@ -39,7 +39,7 @@ SUPPORTING_LIBS =	$(top_builddir)/vio/li
                         $(top_builddir)/regex/libregex.la \
                         $(top_builddir)/strings/libmystrings.la
 mysqld_DEPENDENCIES=    @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la
-LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@ $(openssl_libs) $(yassl_libs)
+LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
 mysqld_LDADD =          libndb.la \
                         @MYSQLD_EXTRA_LDFLAGS@ \
                         @pstack_libs@ $(libevent_libs) \

=== modified file 'storage/ndb/config/type_ndbapitest.mk.am'
--- a/storage/ndb/config/type_ndbapitest.mk.am	2010-09-27 11:28:40 +0000
+++ b/storage/ndb/config/type_ndbapitest.mk.am	2010-09-28 13:07:42 +0000
@@ -17,8 +17,7 @@ LDADD += $(top_builddir)/storage/ndb/tes
          $(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)/strings/libmystrings.la @NDB_SCI_LIBS@
 
 INCLUDES += -I$(top_srcdir) \
         -I$(top_builddir)/include \

=== modified file 'storage/ndb/src/kernel/Makefile.am'
--- a/storage/ndb/src/kernel/Makefile.am	2010-09-27 11:28:40 +0000
+++ b/storage/ndb/src/kernel/Makefile.am	2010-09-28 13:07:42 +0000
@@ -55,7 +55,7 @@ LDADD +=  \
               $(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@ $(ZLIB_LIBS)
+         $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@
 
 windoze-dsp: ndbd.dsp
 

=== modified file 'storage/ndb/src/ndbapi/Makefile.am'
--- a/storage/ndb/src/ndbapi/Makefile.am	2010-09-27 11:28:40 +0000
+++ b/storage/ndb/src/ndbapi/Makefile.am	2010-09-28 13:07:42 +0000
@@ -69,8 +69,7 @@ include $(top_srcdir)/storage/ndb/config
 ndberror_check_LDFLAGS = \
          $(top_builddir)/dbug/libdbug.la \
          $(top_builddir)/mysys/libmysys.la \
-         $(top_builddir)/strings/libmystrings.la \
-         $(ZLIB_LIBS)
+         $(top_builddir)/strings/libmystrings.la
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

=== modified file 'storage/xtradb/Makefile.am'
--- a/storage/xtradb/Makefile.am	2010-09-27 13:27:47 +0000
+++ b/storage/xtradb/Makefile.am	2010-09-28 13:07:42 +0000
@@ -334,7 +334,7 @@ pkgplugin_LTLIBRARIES=	@plugin_xtradb_sh
 ha_xtradb_la_LDFLAGS=   -module -rpath $(pkgplugindir)
 ha_xtradb_la_CXXFLAGS=  -shared $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS)
 ha_xtradb_la_CFLAGS=    -shared $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
-ha_xtradb_la_SOURCES=   $(libxtradb_a_SOURCES)
+ha_xtradb_la_SOURCES=   $(libxtradb_la_SOURCES)
 
 EXTRA_DIST=             CMakeLists.txt plug.in \
                         pars/make_bison.sh pars/make_flex.sh \

=== modified file 'unittest/mysys/Makefile.am'
--- a/unittest/mysys/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/unittest/mysys/Makefile.am	2010-09-28 13:07:42 +0000
@@ -21,8 +21,7 @@ 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 \
-                  $(ZLIB_LIBS)
+                  $(top_builddir)/strings/libmystrings.la
 
 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-16 12:49:35 +0000
+++ b/unittest/strings/Makefile.am	2010-09-28 13:07:42 +0000
@@ -19,8 +19,7 @@ AM_CPPFLAGS     += -I$(top_srcdir)/inclu
 LDADD           = $(top_builddir)/unittest/mytap/libmytap.a \
                   $(top_builddir)/mysys/libmysys.la \
                   $(top_builddir)/dbug/libdbug.la \
-                  $(top_builddir)/strings/libmystrings.la \
-                  $(ZLIB_LIBS)
+                  $(top_builddir)/strings/libmystrings.la
 
 noinst_PROGRAMS  = strings-t
 

=== modified file 'vio/Makefile.am'
--- a/vio/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/vio/Makefile.am	2010-09-28 13:07:42 +0000
@@ -21,5 +21,6 @@ pkglib_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



More information about the commits mailing list