mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-01-24 14:24:59 +08:00
* ltmain.in: always link a library before its dependency libs
* mdemo/Makefile.am: test -export-symbols-regex
This commit is contained in:
parent
3e89f4c492
commit
b29cdab5af
@ -1,3 +1,8 @@
|
||||
1999-03-31 Thomas Tanner <tanner@gmx.de>
|
||||
|
||||
* ltmain.in: always link a library before its dependency libs
|
||||
* mdemo/Makefile.am: test -export-symbols-regex
|
||||
|
||||
1999-03-30 Thomas Tanner <tanner@gmx.de>
|
||||
|
||||
* doc/libtool.texi: fixed a typo
|
||||
|
41
ltmain.in
41
ltmain.in
@ -1852,7 +1852,7 @@ compiler."
|
||||
fi
|
||||
|
||||
# Link against this library
|
||||
newdependency_libs="$newdependency_libs $dependency_libs $abs_ladir/$laname"
|
||||
newdependency_libs="$newdependency_libs $abs_ladir/$laname $dependency_libs"
|
||||
done
|
||||
|
||||
# Make sure lib_search_path contains only unique directories.
|
||||
@ -2120,7 +2120,7 @@ EOF
|
||||
;;
|
||||
*)
|
||||
# Add libc to deplibs on all other systems.
|
||||
deplibs="-lc $deplibs"
|
||||
deplibs="$deplibs -lc"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@ -2488,8 +2488,26 @@ EOF
|
||||
exit 1
|
||||
fi
|
||||
|
||||
ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
|
||||
test "X$ladir" = "X$lib" && ladir="."
|
||||
# We need an absolute path.
|
||||
case "$ladir" in
|
||||
/* | [A-Za-z]:[/\\]*) ;;
|
||||
*)
|
||||
abs_ladir=`cd "$ladir" && pwd`
|
||||
if test -z "$abs_ladir"; then
|
||||
$echo "$modename: cannot determine absolute directory name of \`$ladir'" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
ladir="$abs_ladir"
|
||||
;;
|
||||
esac
|
||||
laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
|
||||
new_lib_search_path="$new_lib_search_path `$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`"
|
||||
|
||||
deplibs="$deplibs $lib"
|
||||
absdeplibs="$absdeplibs $ladir/$laname"
|
||||
|
||||
for deplib in $dependency_libs; do
|
||||
case "$deplib" in
|
||||
-L*)
|
||||
@ -2518,25 +2536,6 @@ EOF
|
||||
esac
|
||||
fi
|
||||
done
|
||||
|
||||
ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
|
||||
test "X$ladir" = "X$lib" && ladir="."
|
||||
# We need an absolute path.
|
||||
case "$ladir" in
|
||||
/* | [A-Za-z]:[/\\]*) ;;
|
||||
*)
|
||||
abs_ladir=`cd "$ladir" && pwd`
|
||||
if test -z "$abs_ladir"; then
|
||||
$echo "$modename: cannot determine absolute directory name of \`$ladir'" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
ladir="$abs_ladir"
|
||||
;;
|
||||
esac
|
||||
laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
|
||||
|
||||
deplibs="$deplibs $lib"
|
||||
absdeplibs="$absdeplibs $ladir/$laname"
|
||||
done
|
||||
|
||||
# Eliminate all dependency_libs that are already contained in deplibs
|
||||
|
@ -14,7 +14,7 @@ foo1_la_LDFLAGS = -module -avoid-version
|
||||
|
||||
libfoo2_la_SOURCES = foo2.c
|
||||
libfoo2_la_LIBADD = $(LIBM)
|
||||
libfoo2_la_LDFLAGS = -module
|
||||
libfoo2_la_LDFLAGS = -module -export-symbols-regex "libfoo2.*"
|
||||
|
||||
noinst_HEADERS = foo.h
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user