diff options
| author | unknown <serg@serg.mylan> | 2006-04-12 14:08:24 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-04-12 14:08:24 +0200 |
| commit | c566f9a25f53ea88ef75d2f4d6e8c6f61745b3e7 (patch) | |
| tree | 46aa796924bcff90935d9149ffb0d65ac7c6ae61 /libmysqld | |
| parent | ef1ec197449dbfc00f64834af4564021368ac765 (diff) | |
| download | mariadb-git-c566f9a25f53ea88ef75d2f4d6e8c6f61745b3e7.tar.gz | |
fixes for 'make dist' and 'make distcheck'
BUILD/compile-dist:
fixes for 'make dist' and 'make distcheck'
include yassl in "dist"
Makefile.am:
fixes for 'make dist' and 'make distcheck'
remove double-listing of everything in SUBDIRS and DIST_SUBDIRS
remove @yassl_dir@, it belongs to extra/Makefile.am
specify --basedir for mysql_install_db, in case builddir (where mysql_install_db is)
differs from srcdir (where mysql_fix_privilege_tables.sql is)
config/ac-macros/yassl.m4:
fixes for 'make dist' and 'make distcheck'
create Makefile's only if yassl is used
yassl_dir must not include /
config/ac-macros/zlib.m4:
fixes for 'make dist' and 'make distcheck'
create Makefile only if zlib is used
configure.in:
fixes for 'make dist' and 'make distcheck'
create Makefile only if a feature is enabled
storage engine dirs must not include /
automatically disable readline/libedit/sql-bench if source dir is missing
extra/Makefile.am:
fixes for 'make dist' and 'make distcheck'
remove SUBDIR/DIST_SUBDIR hack
libmysql_r/Makefile.am:
fixes for 'make dist' and 'make distcheck'
when symlinking all files from libmysql/ take into account that
srcdir != builddir
libmysqld/Makefile.am:
fixes for 'make dist' and 'make distcheck'
remove fragile promiscuous search for object files
if .o file is not where we look for it - extract it from the library
mysql-test/ndb/Makefile.am:
fixes for 'make dist' and 'make distcheck'
ndbcluster script is not a "source"
don't forget to cleanup
plugin/Makefile.am:
fixes for 'make dist' and 'make distcheck'
include plugin/fulltext/configure.in template in the distribution
storage/Makefile.am:
fixes for 'make dist' and 'make distcheck'
remove SUBDIRS/DIST_SUBDIRS hack
storage/ndb/Makefile.am:
fixes for 'make dist' and 'make distcheck'
force common.mk.am out of DIST_COMMON (which is otherwise an
auto-generated list of Makefile's sources) because it's listed
indirectly in EXTRA_DIST, and with bk -r get, a file cannot be copied
twice.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 961eea21d2a..89c5b645104 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -136,12 +136,18 @@ else then \ $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \ else \ + rm -rf tmp; mkdir tmp; \ (for arc in ./libmysqld_int.a $(INC_LIB); do \ arpath=`echo $$arc|sed 's|[^/]*$$||'`; \ - $(AR) t $$arc|xargs -n 1 find $$arpath -name; \ - $(AR) t $$arc|xargs -n 1 find `dirname $$arpath` -path \*/`basename $$arpath`/\* -name; \ + artmp=`echo $$arc|sed 's|^.*/|tmp/lib-|'`; \ + for F in `$(AR) t $$arc`; do \ + if test -e "$$arpath/$$F" ; then echo "$$arpath/$$F"; else \ + mkdir $$artmp; cd $$artmp; $(AR) x ../../$$arc; \ + cd ../..; ls $$artmp/*; \ + continue 2; fi; done; \ done; echo $(libmysqld_a_DEPENDENCIES) ) | sort -u | xargs $(AR) cq libmysqld.a ; \ $(RANLIB) libmysqld.a ; \ + rm -rf tmp; \ fi endif |