From: Alexandre Oliva Date: Wed, 16 Dec 1998 02:31:59 +0000 (+0000) Subject: * tests/Makefile.am (EXTRA_DIST): remove ltdl-*.test X-Git-Tag: release-1-2d~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60fdde04e2a58a11ab9a8222f16e62ff28d52b41;p=thirdparty%2Flibtool.git * tests/Makefile.am (EXTRA_DIST): remove ltdl-*.test (clean-local): don't clean libltdl any more * tests/ltdl-conf.test: removed * tests/ltdl-inst.test: ditto * tests/ltdl-make.test: ditto * tests/ltdl-unst.test: ditto * tests/mdemo-make.test: updated accordingly * tests/mdemo-inst.test: ditto * tests/mdemo-unst.test: ditto * doc/libtool.texi: ditto --- diff --git a/ChangeLog b/ChangeLog index 09e618835..ee607cda4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 1998-12-16 Alexandre Oliva + * tests/Makefile.am (EXTRA_DIST): remove ltdl-*.test + (clean-local): don't clean libltdl any more + * tests/ltdl-conf.test: removed + * tests/ltdl-inst.test: ditto + * tests/ltdl-make.test: ditto + * tests/ltdl-unst.test: ditto + * tests/mdemo-make.test: updated accordingly + * tests/mdemo-inst.test: ditto + * tests/mdemo-unst.test: ditto + * doc/libtool.texi: ditto + * ltmain.in (-DSTATIC): changed to -DLIBTOOL_STATIC, and defined only for -force-static; it should be removed soon, before people start to use it diff --git a/doc/libtool.texi b/doc/libtool.texi index 36cf6c8ff..bfe160390 100644 --- a/doc/libtool.texi +++ b/doc/libtool.texi @@ -2568,23 +2568,6 @@ uninstalled correctly. The @file{demo} subdirectory contains a demonstration of a trivial package that uses libtool. -@item libltdl-conf.test -@itemx libltdl-inst.test -@itemx libltdl-make.test -@itemx libltdl-unst.test -@pindex libltdl-conf.test -@pindex libltdl-inst.test -@pindex libltdl-make.test -@pindex libltdl-unst.test -These programs check to see that the @file{libltdl} subdirectory of the -libtool distribution can be configured, built, installed, and -uninstalled correctly. - -The @file{libltdl} subdirectory contains the library 'libltdl', -which provides a dlopen wrapper for various platforms -(Linux, Solaris, HP/UX, Win32 etc.) including support for dlpreopened modules -(@pxref{Dlpreopening}). - @item mdemo-conf.test @itemx mdemo-exec.test @itemx mdemo-inst.test @@ -2599,12 +2582,14 @@ These programs check to see that the @file{mdemo} subdirectory of the libtool distribution can be configured, built, installed, and uninstalled correctly. -The @file{mdemo} subdirectory contains a demonstration of a package that -uses libtool and the system independent dlopen wrapper 'libltdl' to load -modules. +The @file{mdemo} subdirectory contains a demonstration of a package that +uses libtool and the system independent dlopen wrapper @file{libltdl} to +load modules. The library @file{libltdl} provides an experimental +dlopen wrapper for various platforms (Linux, Solaris, HP/UX, Win32 etc.) +including support for dlpreopened modules (@pxref{Dlpreopening}). NOTE: The tests @file{mdemo-exec.test} and @file{mdemo-inst.test} are known -to fail on platforms that do not support inter-library dependencies. +to fail on platforms that do not fully support inter-library dependencies. @item hardcode.test @pindex hardcode.test diff --git a/tests/Makefile.am b/tests/Makefile.am index 93c92086e..1b875071c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,8 +4,6 @@ AUTOMAKE_OPTIONS = gnits TESTS = demo-conf.test demo-make.test demo-exec.test \ demo-inst.test demo-unst.test hardcode.test \ - ltdl-conf.test ltdl-make.test ltdl-inst.test \ - ltdl-unst.test \ mdemo-conf.test mdemo-make.test mdemo-exec.test \ mdemo-inst.test mdemo-unst.test \ link.test link-2.test nomode.test \ @@ -21,5 +19,4 @@ EXTRA_DIST = defs $(TESTS) clean-local: -test -f ../demo/Makefile && cd ../demo && $(MAKE) distclean -test -f ../mdemo/Makefile && cd ../mdemo && $(MAKE) distclean - -test -f ../libltdl/Makefile && cd ../libltdl && $(MAKE) distclean rm -rf _inst diff --git a/tests/ltdl-conf.test b/tests/ltdl-conf.test deleted file mode 100644 index c2a672742..000000000 --- a/tests/ltdl-conf.test +++ /dev/null @@ -1,30 +0,0 @@ -#! /bin/sh -# ltdl-conf.test - try configuring the ../libltdl subdirectory - -# Test script header. -need_prefix=yes -if test -z "$srcdir"; then - srcdir=`echo "$0" | sed 's%/[^/]*$%%'` - test "$srcdir" = "$0" && srcdir=. - test "${VERBOSE+set}" != "set" && VERBOSE=yes -fi -. $srcdir/defs || exit 1 - -# Maybe we have a VPATH build, in which case, create a new subdir. -test -d ../libltdl || mkdir ../libltdl - -# Change to our build directory. -cd ../libltdl || exit 1 - -# Possibly clean up the distribution. -if test -f Makefile; then - echo "= Running $make distclean in ../libltdl" - $make distclean -fi -rm -f config.cache - -# Configure the demonstration. -echo "= Configuring in ../libltdl (prefix=$prefix)" -CONFIG_SITE=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../libltdl/configure --srcdir=$srcdir/../libltdl --prefix=$prefix || exit 1 - -exit 0 diff --git a/tests/ltdl-inst.test b/tests/ltdl-inst.test deleted file mode 100644 index 9661837e1..000000000 --- a/tests/ltdl-inst.test +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/sh -# ltdl-inst.test - try installing from the ../libltdl subdirectory - -# Test script header. -need_prefix=yes -if test -z "$srcdir"; then - srcdir=`echo "$0" | sed 's%/[^/]*$%%'` - test "$srcdir" = "$0" && srcdir=. - test "${VERBOSE+set}" != "set" && VERBOSE=yes -fi -. $srcdir/defs || exit 1 - -# Check that things are built. -if test -f ../libltdl/libltdl.la; then : -else - echo "You must run ltdl-make.test before $0" 1>&2 - exit 1 -fi - -# Change to our build directory. -cd ../libltdl || exit 1 - -echo "= Running $make install in ../libltdl" -$make install || exit 1 - -exit 0 diff --git a/tests/ltdl-make.test b/tests/ltdl-make.test deleted file mode 100644 index bfb26e02a..000000000 --- a/tests/ltdl-make.test +++ /dev/null @@ -1,25 +0,0 @@ -#! /bin/sh -# ltdl-make.test - try building in the ../libltdl subdirectory - -# Test script header. -need_prefix=no -if test -z "$srcdir"; then - srcdir=`echo "$0" | sed 's%/[^/]*$%%'` - test "$srcdir" = "$0" && srcdir=. - test "${VERBOSE+set}" != "set" && VERBOSE=yes -fi -. $srcdir/defs || exit 1 - -if test -f ../libltdl/Makefile; then : -else - echo "You must run ltdl-conf.test before running $0" 1>&2 - exit 1 -fi - -# Change to our build directory. -cd ../libltdl || exit 1 - -# Do the actual build. -echo "Making in ../libltdl" -$make || exit 1 -exit 0 diff --git a/tests/ltdl-unst.test b/tests/ltdl-unst.test deleted file mode 100644 index 4d2c0d1a0..000000000 --- a/tests/ltdl-unst.test +++ /dev/null @@ -1,35 +0,0 @@ -#! /bin/sh -# ltdl.test - try uninstalling in the ../libltdl subdirectory - -# Test script header. -need_prefix=yes -if test -z "$srcdir"; then - srcdir=`echo "$0" | sed 's%/[^/]*$%%'` - test "$srcdir" = "$0" && srcdir=. - test "${VERBOSE+set}" != "set" && VERBOSE=yes -fi -. $srcdir/defs || exit 1 - -# Maybe we have a VPATH build, in which case, create a new subdir. -if test "$prefix/bin/hell"; then : -else - echo "You must run ltdl-inst.test before $0." 1>&2 - exit 1 -fi - -# Change to our build directory. -cd ../libltdl || exit 1 - -echo "= Running $make uninstall in ../libltdl" -$make uninstall || exit 1 - -# See that there were no files leftover in $prefix. -# Ignore dotfiles, so that .nfsXXX files don't screw up the test. -leftovers=`find $prefix ! -type d ! -name '.*' -print` -if test -n "$leftovers"; then - echo "= Leftover after make uninstall:" - ls -l $leftovers - exit 1 -fi - -exit 0 diff --git a/tests/mdemo-inst.test b/tests/mdemo-inst.test index eb850b2c7..e5d307614 100755 --- a/tests/mdemo-inst.test +++ b/tests/mdemo-inst.test @@ -17,13 +17,10 @@ else exit 1 fi -# Check that ltdl is installed. -if test -f ../libltdl/libltdl.la; then - cd ../libltdl || exit 1 - echo "= Running $make install in ../libltdl" - $make install || exit 1 +# Check that things are built. +if test -f ../libltdl/libltdl.la; then : else - echo "You must run ltdl-make.test before $0" 1>&2 + echo "You must build libltdl before $0" 1>&2 exit 1 fi diff --git a/tests/mdemo-make.test b/tests/mdemo-make.test index f3ed64eb2..7c79d3b70 100755 --- a/tests/mdemo-make.test +++ b/tests/mdemo-make.test @@ -13,7 +13,7 @@ fi # Check that things are built. if test -f ../libltdl/libltdl.la; then : else - echo "You must run ltdl-make.test before $0" 1>&2 + echo "You must built libltdl before $0" 1>&2 exit 1 fi diff --git a/tests/mdemo-unst.test b/tests/mdemo-unst.test index 76570d04d..77c5d0ac0 100755 --- a/tests/mdemo-unst.test +++ b/tests/mdemo-unst.test @@ -17,12 +17,6 @@ else exit 1 fi -if test -f ../libltdl/libltdl.la; then - cd ../libltdl || exit 1 - echo "= Running $make uninstall in ../libltdl" - $make uninstall || exit 1 -fi - # Change to our build directory. cd ../mdemo || exit 1