diff options
| author | rburnett@bk-internal.mysql.com <> | 2006-05-22 17:25:46 +0200 |
|---|---|---|
| committer | rburnett@bk-internal.mysql.com <> | 2006-05-22 17:25:46 +0200 |
| commit | 179d483355a36181844f32b29b76b721bc9b0bf4 (patch) | |
| tree | 3387e7c3e22a5310813f1db24a3f3c8d632510b0 /libmysqld | |
| parent | d0c54b6e087ee6d89975c8c0ae9b9d5574cbfa5b (diff) | |
| parent | b2494b8174bc6e7a4857c8214ba90e36a5e84115 (diff) | |
| download | mariadb-git-179d483355a36181844f32b29b76b721bc9b0bf4.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index dab99d7509e..8d1591282db 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -88,11 +88,11 @@ INC_LIB= $(top_builddir)/regex/libregex.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/vio/libvio.a \ @mysql_plugin_libs@ \ - $(yassl_las) + $(yassl_inc_libs) if HAVE_YASSL -yassl_las = $(top_srcdir)/extra/yassl/src/libyassl.la \ - $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la +yassl_inc_libs= $(top_srcdir)/extra/yassl/src/.libs/libyassl.a \ + $(top_srcdir)/extra/yassl/taocrypt/src/.libs/libtaocrypt.a endif # Storage engine specific compilation options @@ -135,12 +135,12 @@ else (for arc in ./libmysqld_int.a $(INC_LIB); do \ arpath=`echo $$arc|sed 's|[^/]*$$||'|sed 's|\.libs/$$||'`; \ artmp=`echo $$arc|sed 's|^.*/|tmp/lib-|'`; \ - for F in `$(AR) t $$arc`; do \ + for F in `$(AR) t $$arc | grep -v SYMDEF`; do \ if test -e "$$arpath/$$F" ; then echo "$$arpath/$$F"; else \ mkdir $$artmp; cd $$artmp > /dev/null; \ $(AR) x ../../$$arc; \ cd $$current_dir > /dev/null; \ - ls $$artmp/*; \ + ls $$artmp/* | grep -v SYMDEF; \ continue 2; fi; done; \ done; echo $(libmysqld_a_DEPENDENCIES) ) | sort -u | xargs $(AR) cq libmysqld.a ; \ $(RANLIB) libmysqld.a ; \ |