diff options
| author | monty@mysql.com <> | 2004-05-25 22:54:00 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-25 22:54:00 +0300 |
| commit | 390d9898f9adb21c9794b8161749d8e3fcab7820 (patch) | |
| tree | b258dbd41e0b45f70adf8c42ee94cce74cd0232f /libmysqld | |
| parent | 96b6f0a68661a62ba4c92620dac457ad39fc6f0d (diff) | |
| parent | 2397f7081af8d5b42b6ec124e68e5279dae2f05a (diff) | |
| download | mariadb-git-390d9898f9adb21c9794b8161749d8e3fcab7820.tar.gz | |
merge with 4.0 to get Netware patches and fixes for libmysqld.dll
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 25a2d9c1a06..e258b10c6e6 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -77,25 +77,32 @@ INC_LIB= $(top_builddir)/regex/libregex.a \ $(top_builddir)/vio/libvio.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 |