Author: glen Date: Sat Apr 22 19:34:10 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - link everything shared, NFY
---- Files affected: SOURCES: mysql-shared.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/mysql-shared.patch diff -u /dev/null SOURCES/mysql-shared.patch:1.1 --- /dev/null Sat Apr 22 21:34:10 2006 +++ SOURCES/mysql-shared.patch Sat Apr 22 21:34:04 2006 @@ -0,0 +1,370 @@ +diff -ur mysql-5.0.20a/client/Makefile.am mysql-5.0.20a-shared/client/Makefile.am +--- mysql-5.0.20a/client/Makefile.am 2006-04-18 14:46:08.000000000 +0300 ++++ mysql-5.0.20a-shared/client/Makefile.am 2006-04-22 18:11:15.407051553 +0300 +@@ -39,7 +39,7 @@ + mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS) + mysqltest_SOURCES= mysqltest.c $(top_srcdir)/mysys/my_getsystime.c \ + $(yassl_dummy_link_fix) +-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 + mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS) + mysqltestmanager_pwgen_SOURCES = mysqlmanager-pwgen.c +diff -ur mysql-5.0.20a/configure.in mysql-5.0.20a-shared/configure.in +--- mysql-5.0.20a/configure.in 2006-04-22 22:25:50.208166045 +0300 ++++ mysql-5.0.20a-shared/configure.in 2006-04-22 18:02:23.665203044 +0300 +@@ -2502,7 +2502,7 @@ + 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" ++ THREAD_LOBJECTS="thr_alarm.lo thr_lock.lo thr_mutex.lo thr_rwlock.lo my_pthread.lo my_thr_init.lo mf_keycache.lo" + AC_SUBST(THREAD_LOBJECTS) + server_scripts="mysqld_safe mysql_install_db" + sql_server_dirs="strings mysys dbug extra regex" +diff -ur mysql-5.0.20a/dbug/Makefile.am mysql-5.0.20a-shared/dbug/Makefile.am +--- mysql-5.0.20a/dbug/Makefile.am 2006-04-18 14:46:00.000000000 +0300 ++++ mysql-5.0.20a-shared/dbug/Makefile.am 2006-04-22 17:52:40.052199264 +0300 +@@ -16,10 +16,10 @@ + # MA 02111-1307, USA + + INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include +-LDADD = libdbug.a ../mysys/libmysys.a ../strings/libmystrings.a +-pkglib_LIBRARIES = libdbug.a ++LDADD = libdbug.la ../mysys/libmysys.a ../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 + 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 +diff -ur mysql-5.0.20a/extra/Makefile.am mysql-5.0.20a-shared/extra/Makefile.am +--- mysql-5.0.20a/extra/Makefile.am 2006-04-18 14:46:14.000000000 +0300 ++++ mysql-5.0.20a-shared/extra/Makefile.am 2006-04-22 18:18:36.186875302 +0300 +@@ -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 +diff -ur mysql-5.0.20a/heap/Makefile.am mysql-5.0.20a-shared/heap/Makefile.am +--- mysql-5.0.20a/heap/Makefile.am 2006-04-18 14:46:01.000000000 +0300 ++++ mysql-5.0.20a-shared/heap/Makefile.am 2006-04-22 18:21:16.460447313 +0300 +@@ -15,14 +15,14 @@ + # 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 \ +diff -ur mysql-5.0.20a/libmysqld/Makefile.am mysql-5.0.20a-shared/libmysqld/Makefile.am +--- mysql-5.0.20a/libmysqld/Makefile.am 2006-04-18 14:46:26.000000000 +0300 ++++ mysql-5.0.20a-shared/libmysqld/Makefile.am 2006-04-22 22:20:48.241409609 +0300 +@@ -31,8 +31,7 @@ + -I$(top_srcdir)/regex \ + $(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@ + +-noinst_LIBRARIES = libmysqld_int.a +-pkglib_LIBRARIES = libmysqld.a ++pkglib_LTLIBRARIES = libmysqld.la + SUBDIRS = . examples + libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc + libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \ +@@ -65,22 +64,23 @@ + 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= ++libmysqld_la_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources) ++libmysqld_la_LIBADD= $(INC_LIB1) + + # 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 ++# The following libraries should be included in libmysqld.la ++INC_LIB1= $(top_builddir)/regex/libregex.la \ ++ $(top_builddir)/myisam/libmyisam.la \ ++ $(top_builddir)/myisammrg/libmyisammrg.la \ ++ $(top_builddir)/heap/libheap.la \ ++ $(top_builddir)/mysys/libmysys.la \ ++ $(top_builddir)/strings/libmystrings.la \ ++ $(top_builddir)/dbug/libdbug.la \ ++ $(top_builddir)/vio/libvio.la ++ ++INC_LIB2= @innodb_libs@ @bdb_libs_with_path@ + + + # +@@ -93,7 +93,7 @@ + # 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) ++libmysqld1.a: libmysqld_int.a $(INC_LIB) + if DARWIN_MWCC + mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u` + else +diff -ur mysql-5.0.20a/libmysqld/examples/Makefile.am mysql-5.0.20a-shared/libmysqld/examples/Makefile.am +--- mysql-5.0.20a/libmysqld/examples/Makefile.am 2006-04-18 14:46:13.000000000 +0300 ++++ mysql-5.0.20a-shared/libmysqld/examples/Makefile.am 2006-04-22 22:15:07.623787021 +0300 +@@ -36,11 +36,11 @@ + -I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \ + $(openssl_includes) $(yassl_includes) + LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs) +-LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) ++LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.la ../../libmysql/libmysqlclient.la ../../mysys/libmysys.la @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) + + mysqltest_embedded_LINK = $(CXXLINK) + mysqltest_embedded_SOURCES = mysqltest.c +-mysqltest_embedded_LDADD = $(LDADD) $(top_builddir)/regex/libregex.a ++mysqltest_embedded_LDADD = $(LDADD) $(top_builddir)/regex/libregex.la + + mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \ + my_readline.h sql_string.h completion_hash.h +diff -ur mysql-5.0.20a/myisam/Makefile.am mysql-5.0.20a-shared/myisam/Makefile.am +--- mysql-5.0.20a/myisam/Makefile.am 2006-04-22 22:25:49.988161123 +0300 ++++ mysql-5.0.20a-shared/myisam/Makefile.am 2006-04-22 19:39:28.315192339 +0300 +@@ -18,11 +18,11 @@ + 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@ $(libdir)/libsupc++.la +-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@ $(libdir)/libsupc++.la ++pkglib_LTLIBRARIES = libmyisam.la + bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump + myisamchk_DEPENDENCIES= $(LIBRARIES) + myisamlog_DEPENDENCIES= $(LIBRARIES) +@@ -37,7 +37,7 @@ + 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 \ ++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 \ +diff -ur mysql-5.0.20a/myisammrg/Makefile.am mysql-5.0.20a-shared/myisammrg/Makefile.am +--- mysql-5.0.20a/myisammrg/Makefile.am 2006-04-18 14:46:13.000000000 +0300 ++++ mysql-5.0.20a-shared/myisammrg/Makefile.am 2006-04-22 19:42:18.899002980 +0300 +@@ -15,9 +15,9 @@ + # 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 \ +diff -ur mysql-5.0.20a/mysys/Makefile.am mysql-5.0.20a-shared/mysys/Makefile.am +--- mysql-5.0.20a/mysys/Makefile.am 2006-04-18 14:46:10.000000000 +0300 ++++ mysql-5.0.20a-shared/mysys/Makefile.am 2006-04-22 19:32:57.206455033 +0300 +@@ -19,18 +19,18 @@ + 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 \ +- mf_keycache.c mf_keycaches.c my_crc32.c \ ++ mf_keycaches.c my_crc32.c \ + mf_iocache.c mf_iocache2.c mf_cache.c mf_tempfile.c \ + mf_tempdir.c my_lock.c mf_brkhant.c my_alarm.c \ + my_malloc.c my_realloc.c my_once.c mulalloc.c \ +@@ -57,8 +57,8 @@ + my_handler.c my_netware.c my_largepage.c \ + my_windac.c my_access.c base64.c + EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \ +- thr_mutex.c thr_rwlock.c +-libmysys_a_LIBADD = @THREAD_LOBJECTS@ ++ thr_mutex.c thr_rwlock.c mf_keycache.c ++libmysys_la_LIBADD = @THREAD_LOBJECTS@ -lz ../strings/libmystrings.la + # test_dir_DEPENDENCIES= $(LIBRARIES) + # testhash_DEPENDENCIES= $(LIBRARIES) + # test_charset_DEPENDENCIES= $(LIBRARIES) +@@ -72,7 +72,7 @@ + -DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \ + @DEFS@ + +-libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@ ++libmysys_la_DEPENDENCIES= @THREAD_LOBJECTS@ + + # I hope this always does the right thing. Otherwise this is only test programs + FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@ +diff -ur mysql-5.0.20a/pstack/Makefile.am mysql-5.0.20a-shared/pstack/Makefile.am +--- mysql-5.0.20a/pstack/Makefile.am 2006-04-18 14:46:07.000000000 +0300 ++++ mysql-5.0.20a-shared/pstack/Makefile.am 2006-04-22 20:51:22.071525524 +0300 +@@ -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_LIBRARIES = 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 +diff -ur mysql-5.0.20a/regex/Makefile.am mysql-5.0.20a-shared/regex/Makefile.am +--- mysql-5.0.20a/regex/Makefile.am 2006-04-18 14:46:09.000000000 +0300 ++++ mysql-5.0.20a-shared/regex/Makefile.am 2006-04-22 18:14:35.951520907 +0300 +@@ -16,10 +16,12 @@ + # 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 ++pkglib_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 ++libregex_la_LIBADD= + noinst_PROGRAMS = re + re_SOURCES = split.c debug.c main.c + re_LDFLAGS= @NOINST_LDFLAGS@ +diff -ur mysql-5.0.20a/sql/Makefile.am mysql-5.0.20a-shared/sql/Makefile.am +--- mysql-5.0.20a/sql/Makefile.am 2006-04-22 22:25:49.988161123 +0300 ++++ mysql-5.0.20a-shared/sql/Makefile.am 2006-04-22 20:49:53.919557294 +0300 +@@ -30,14 +30,14 @@ + noinst_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@ \ +diff -ur mysql-5.0.20a/strings/Makefile.am mysql-5.0.20a-shared/strings/Makefile.am +--- mysql-5.0.20a/strings/Makefile.am 2006-04-18 14:46:12.000000000 +0300 ++++ mysql-5.0.20a-shared/strings/Makefile.am 2006-04-22 17:50:54.709852437 +0300 +@@ -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 \ +@@ -55,9 +55,9 @@ + strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \ + t_ctype.h + +-libmystrings_a_LIBADD= +-conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c bcmp.c +-conf_to_src_LDADD= ++libmystrings_la_LIBADD= ++conf_to_src_SOURCES = conf_to_src.c ++conf_to_src_LDADD= xml.lo ctype.lo bcmp.lo + #force static linking of conf_to_src - essential when linking against + #custom installation of libc + conf_to_src_LDFLAGS= @NOINST_LDFLAGS@ +diff -ur mysql-5.0.20a/vio/Makefile.am mysql-5.0.20a-shared/vio/Makefile.am +--- mysql-5.0.20a/vio/Makefile.am 2006-04-18 14:46:25.000000000 +0300 ++++ mysql-5.0.20a-shared/vio/Makefile.am 2006-04-22 19:44:58.072557193 +0300 +@@ -22,22 +22,22 @@ + INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include \ + $(openssl_includes) $(yassl_includes) + LDADD= @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs) +-pkglib_LIBRARIES= libvio.a ++pkglib_LTLIBRARIES= libvio.la + noinst_PROGRAMS = test-ssl test-sslserver test-sslclient + noinst_HEADERS= vio_priv.h + test_ssl_SOURCES= test-ssl.c $(yassl_dummy_link_fix) +-test_ssl_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \ +- ../mysys/libmysys.a ../strings/libmystrings.a \ ++test_ssl_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.la libvio.la \ ++ ../mysys/libmysys.la ../strings/libmystrings.la \ + $(openssl_libs) $(yassl_libs) + test_sslserver_SOURCES= test-sslserver.c $(yassl_dummy_link_fix) +-test_sslserver_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \ +- ../mysys/libmysys.a ../strings/libmystrings.a \ ++test_sslserver_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.la libvio.la \ ++ ../mysys/libmysys.la ../strings/libmystrings.la \ + $(openssl_libs) $(yassl_libs) + test_sslclient_SOURCES= test-sslclient.c $(yassl_dummy_link_fix) +-test_sslclient_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \ +- ../mysys/libmysys.a ../strings/libmystrings.a \ ++test_sslclient_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.la libvio.la \ ++ ../mysys/libmysys.la ../strings/libmystrings.la \ + $(openssl_libs) $(yassl_libs) +-libvio_a_SOURCES= vio.c viosocket.c viossl.c viosslfactories.c ++libvio_la_SOURCES= vio.c viosocket.c viossl.c viosslfactories.c + + # Don't update the files from bitkeeper + %::SCCS/s.% ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
