diff options
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt (renamed from libmysqld/cmakelists.txt) | 0 | ||||
| -rw-r--r-- | libmysqld/Makefile.am | 10 | ||||
| -rw-r--r-- | libmysqld/examples/CMakeLists.txt (renamed from libmysqld/examples/cmakelists.txt) | 0 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libmysqld/cmakelists.txt b/libmysqld/CMakeLists.txt index 8bd0e0baa32..8bd0e0baa32 100644 --- a/libmysqld/cmakelists.txt +++ b/libmysqld/CMakeLists.txt diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 63e75c34a6d..a3af2d43bd5 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 ; \ diff --git a/libmysqld/examples/cmakelists.txt b/libmysqld/examples/CMakeLists.txt index 5c58264a7e7..5c58264a7e7 100644 --- a/libmysqld/examples/cmakelists.txt +++ b/libmysqld/examples/CMakeLists.txt |