diff options
| author | unknown <serg@serg.mylan> | 2006-04-12 14:14:03 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-04-12 14:14:03 +0200 |
| commit | 1f0612d8696b061818ca14b6007dbf33300491fc (patch) | |
| tree | 50d64b7887c6220d23017d5fb7d58d9c45cbaf99 /libmysqld | |
| parent | c6f311a0c1139af34c4b901def7c433d2e7b43ae (diff) | |
| parent | c566f9a25f53ea88ef75d2f4d6e8c6f61745b3e7 (diff) | |
| download | mariadb-git-1f0612d8696b061818ca14b6007dbf33300491fc.tar.gz | |
Auto merged
Makefile.am:
merged
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 6e38fb267d9..df4d7bb3618 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|[^/]*$$||'|sed 's|\.libs/$$||'`; \ - $(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 |