diff options
| author | konstantin@mysql.com <> | 2005-05-14 12:38:12 +0400 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2005-05-14 12:38:12 +0400 |
| commit | 89bd09fed2565f0e509a9d81ca7e9782ff1f8ea1 (patch) | |
| tree | 301d852032306dc5560a6076b889c4d7c3d6da7d /libmysqld | |
| parent | 3ff39b3704b4b0023ab107217ec36fe578f26e4d (diff) | |
| parent | 6c981c0b8005a1577c7dfd93eb656a5da46ef9f0 (diff) | |
| download | mariadb-git-89bd09fed2565f0e509a9d81ca7e9782ff1f8ea1.tar.gz | |
Manual merge (again)
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 5d3b365042f..6fc919c904f 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -87,6 +87,9 @@ INC_LIB= $(top_builddir)/regex/libregex.a \ # generate a total libmysqld.a from all library files, libmysqld.a: libmysqld_int.a $(INC_LIB) +if DARWIN_MWCC + mwld -lib -o $@ libmysqld_int.a `ls -1 $(INC_LIB) | sort -u` +else if test "$(host_os)" = "netware" ; \ then \ $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \ @@ -108,7 +111,7 @@ libmysqld.a: libmysqld_int.a $(INC_LIB) rm -f tmp/* ; \ $(RANLIB) libmysqld.a ; \ fi - +endif ## XXX: any time the client interface changes, we'll need to bump ## the version info for libmysqld; however, it's possible for the |