diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-13 18:06:05 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-13 18:06:05 +0100 |
| commit | 3d5dfe4ebf8d2e75e068d070a34f350747999329 (patch) | |
| tree | 57a03ba3e8575a63012124ce7c0d6d6ace0906cc /client/Makefile.am | |
| parent | 9f390d04c6050893de90f837be477bd2ce1f79f0 (diff) | |
| download | mariadb-git-3d5dfe4ebf8d2e75e068d070a34f350747999329.tar.gz | |
Remove "yassl_dummy_link_fix" in 5.1 as well
Diffstat (limited to 'client/Makefile.am')
| -rw-r--r-- | client/Makefile.am | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 736c4db005d..07f81d19b56 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -16,12 +16,6 @@ # This file is public domain and comes with NO WARRANTY of any kind -if HAVE_YASSL - yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp -else - yassl_dummy_link_fix= -endif - if THREAD_SAFE_CLIENT LIBMYSQLCLIENT_LA = $(top_builddir)/libmysql_r/libmysqlclient_r.la else @@ -71,19 +65,18 @@ mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS) mysqldump_SOURCES= mysqldump.c \ my_user.c \ - $(top_srcdir)/mysys/mf_getdate.c \ - $(yassl_dummy_link_fix) + $(top_srcdir)/mysys/mf_getdate.c -mysqlimport_SOURCES= mysqlimport.c $(yassl_dummy_link_fix) +mysqlimport_SOURCES= mysqlimport.c mysqlimport_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ @CLIENT_EXTRA_LDFLAGS@ \ $(LIBMYSQLCLIENT_LA) \ $(top_builddir)/mysys/libmysys.a -mysqlshow_SOURCES= mysqlshow.c $(yassl_dummy_link_fix) +mysqlshow_SOURCES= mysqlshow.c -mysqlslap_SOURCES= mysqlslap.c $(yassl_dummy_link_fix) +mysqlslap_SOURCES= mysqlslap.c mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ @CLIENT_EXTRA_LDFLAGS@ \ $(LIBMYSQLCLIENT_LA) \ @@ -91,11 +84,10 @@ mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ mysqltest_SOURCES= mysqltest.c \ $(top_srcdir)/mysys/my_getsystime.c \ - $(top_srcdir)/mysys/my_copy.c \ - $(yassl_dummy_link_fix) + $(top_srcdir)/mysys/my_copy.c mysqltest_LDADD = $(top_builddir)/regex/libregex.a $(LDADD) -mysql_upgrade_SOURCES= mysql_upgrade.c $(yassl_dummy_link_fix) +mysql_upgrade_SOURCES= mysql_upgrade.c # Fix for mit-threads DEFS = -DUNDEF_THREADS_HACK \ |