diff options
author | acurtis@xiphis.org <> | 2006-05-01 22:45:31 -0700 |
---|---|---|
committer | acurtis@xiphis.org <> | 2006-05-01 22:45:31 -0700 |
commit | 09c7374d6941463ed40a7589aff6024f9e0db4e4 (patch) | |
tree | c54f50741a391458499e36ae02a2103f5717f07e /storage/innobase | |
parent | b050f975c43fcfa8f85ad9725e6cfe9eff1b025c (diff) | |
parent | 0736d183378695b26890e134f93113b646699cec (diff) | |
download | mariadb-git-09c7374d6941463ed40a7589aff6024f9e0db4e4.tar.gz |
Merge xiphis.org:/home/antony/work2/mysql-5.1
into xiphis.org:/home/antony/work2/wl3201-post-review.2
Diffstat (limited to 'storage/innobase')
-rw-r--r-- | storage/innobase/Makefile.am | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/storage/innobase/Makefile.am b/storage/innobase/Makefile.am index 0cceac97688..908f5d669a2 100644 --- a/storage/innobase/Makefile.am +++ b/storage/innobase/Makefile.am @@ -79,5 +79,33 @@ EXTRA_DIST = include/btr0btr.h include/btr0btr.ic include/btr0cur.h include/btr include/ut0sort.h include/ut0ut.h include/ut0ut.ic include/ut0vec.h include/ut0vec.ic \ cmakelists.txt +noinst_LIBRARIES = libinnobase.a +libinnobase_a_LIBADD = usr/libusr.a srv/libsrv.a dict/libdict.a \ + que/libque.a srv/libsrv.a ibuf/libibuf.a \ + row/librow.a pars/libpars.a btr/libbtr.a \ + trx/libtrx.a read/libread.a usr/libusr.a \ + buf/libbuf.a ibuf/libibuf.a eval/libeval.a \ + log/liblog.a fsp/libfsp.a fut/libfut.a \ + fil/libfil.a lock/liblock.a mtr/libmtr.a \ + page/libpage.a rem/librem.a thr/libthr.a \ + sync/libsync.a data/libdata.a mach/libmach.a \ + ha/libha.a dyn/libdyn.a mem/libmem.a \ + ut/libut.a os/libos.a ut/libut.a +libinnobase_a_SOURCES = + + +libinnobase.a: $(libinnobase_a_LIBADD) + -rm -f $@ + if test "$(host_os)" = "netware" ; \ + then \ + $(libinnobase_a_AR) $@ $(libinnobase_a_LIBADD) ; \ + else \ + for arc in $(libinnobase_a_LIBADD); do \ + arpath=`echo $$arc|sed 's|[^/]*$$||'`; \ + $(AR) t $$arc|sed "s|^|$$arpath|"; \ + done | sort -u | xargs $(AR) cq $@ ; \ + $(RANLIB) $@ ; \ + fi + # Don't update the files from bitkeeper %::SCCS/s.% |