summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-05-25 22:01:50 +0300
committerunknown <monty@mysql.com>2004-05-25 22:01:50 +0300
commitb287ca53d0b97265478283e4226f5dafb5496ca4 (patch)
treef5abb32f436bbc05db102bf322757f4a03aaa850 /libmysqld
parentb2882fd4f5401fdc9a1aab57de758848e9831f2e (diff)
parentb3851363ba8df0b3f55ecb358849a212db4b12a8 (diff)
downloadmariadb-git-b287ca53d0b97265478283e4226f5dafb5496ca4.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/tmp/skr99/mysql-4.0 client/mysqltest.c: Auto merged configure.in: Auto merged include/my_global.h: Auto merged myisam/myisam_ftdump.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/mysqld.cc: Auto merged
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/Makefile.am44
1 files changed, 25 insertions, 19 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 54bfd6503d4..0bfe1452451 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -71,29 +71,35 @@ INC_LIB= $(top_builddir)/regex/libregex.a \
@innodb_libs@ @bdb_libs_with_path@ \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a \
- $(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/regex/libregex.a
+ $(top_builddir)/dbug/libdbug.a
#
-# To make it easy for the end user to use the embedded library we
-# generate a total libmysqld.a from all library files,
+# To make it easy for the end user to use the embedded library we
+# generate a total libmysqld.a from all library files,
libmysqld.a: libmysqld_int.a $(INC_LIB)
- if test ! -d tmp ; then mkdir tmp ; fi
- rm -f $@ libmysqld_int2.a tmp/*.o tmp/*.a
- cp $(INC_LIB) tmp
- cp libmysqld_int.a libmysqld_int2.a ; \
- cd tmp ; \
- for file in *.a ; do \
- bfile=`basename $$file .a` ; \
- ar x $$file; \
- for obj in *.o ; do mv $$obj $${bfile}_$$obj ; done ; \
- ar q ../libmysqld_int2.a *.o ; \
- rm -f *.o ; \
- done
- mv libmysqld_int2.a libmysqld.a
- rm -f tmp/*
- $(RANLIB) libmysqld.a
+ if test "$(host_os)" = "netware" ; \
+ then \
+ $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \
+ else \
+ if test ! -d tmp ; then mkdir tmp ; fi ; \
+ rm -f $@ libmysqld_int2.a tmp/*.o tmp/*.a ; \
+ cp $(INC_LIB) tmp ; \
+ cp libmysqld_int.a libmysqld_int2.a ; \
+ cd tmp ; \
+ for file in *.a ; do \
+ bfile=`basename $$file .a` ; \
+ ar x $$file; \
+ for obj in *.o ; do mv $$obj $${bfile}_$$obj ; done ; \
+ ar q ../libmysqld_int2.a *.o ; \
+ rm -f *.o ; \
+ done ; \
+ cd .. ; \
+ mv libmysqld_int2.a libmysqld.a ; \
+ rm -f tmp/* ; \
+ $(RANLIB) libmysqld.a ; \
+ fi
+
## XXX: any time the client interface changes, we'll need to bump
## the version info for libmysqld; however, it's possible for the