Apply the following changes from the main trunk:

2001-04-26 22:17  levitte

	* Makefile.org (1.134): Linux shared libraries can be linked with
	debug symbols.	Tru64 shared libraries can be linked with static
	libraries.

diff --git a/Makefile.org b/Makefile.org
index 3b0ecdc78b5eff1e4ed8487df36a80c06617fbc3..0cf8ce4f79aa977259b5753736ba147b20a496f5 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -256,7 +256,7 @@ do_linux-shared: do_gnu-shared
 do_gnu-shared:
        libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
        ( set -x; ${CC}  -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-               -Wl,-S,-soname=lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+               -Wl,-soname=lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
                -Wl,--whole-archive lib$$i.a \
                -Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \
        libs="$$libs -l$$i"; \
@@ -276,7 +276,7 @@ do_alpha-osf1-shared:
 # option passed to the linker.
 do_tru64-shared:
        libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
-       ( set -x; ${CC}  -shared -msym -no_archive -o lib$$i.so \
+       ( set -x; ${CC}  -shared -msym -o lib$$i.so \
                -set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \
                -all lib$$i.a -none $$libs ${EX_LIBS} -lc ) || exit 1; \
        libs="$$libs -l$$i"; \
@@ -287,7 +287,7 @@ do_tru64-shared:
 # -rpath ${INSTALLTOP}/lib passed to the linker.
 do_tru64-shared-rpath:
        libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
-       ( set -x; ${CC}  -shared -msym -no_archive -o lib$$i.so \
+       ( set -x; ${CC}  -shared -msym -o lib$$i.so \
                -rpath  ${INSTALLTOP}/lib \
                -set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \
                -all lib$$i.a -none $$libs ${EX_LIBS} -lc ) || exit 1; \