]> git.ipfire.org Git - thirdparty/libtool.git/commitdiff
Since the bootstrap process requires that several of the rules for
authorGary V. Vaughan <gary@gnu.org>
Wed, 13 Apr 2005 12:24:35 +0000 (12:24 +0000)
committerGary V. Vaughan <gary@gnu.org>
Wed, 13 Apr 2005 12:24:35 +0000 (12:24 +0000)
files generated in doc and tests already lived in
$top_srcdir/Makefile.am, along with proxy rules in sub-Makefiles,
this changeset consolidates almost everything into the top
Makefile.am, simplifying things considerably:

* doc/Makefile.am, tests/Makefile.am: Removed.  All rules moved...
* Makefile.am: ...to here and adjusted to run from $top_builddir.
Some reformatting to group rules and declarations by purpose, and
simplify with respect to removing much of the make recursion.
Add `doc/PLATFORMS', `doc/fdl.texi' and `doc/notes.texi'.
`defs.in' and `defs.m4sh' are in directory `tests'.
(uninstall-hook): Don't forget to uninstall libtoolize's libltdl
source tree.
* bootstrap: Simplified dirty makefile management, and bootstrap
file creation in light of having only a single pertinent
Makefile.
* configure.ac (CONF_SUBDIRS): Add tests/ prefix to each subdir to
compensate.
(DIST_MAKEFILE_LIST): Adjust.
(AC_CONFIG_FILES): Remove doc/Makefile and tests/Makefile.
* tests/defs.m4sh (LIBTOOL, scripts): Adjust paths.
* tests/cdemo-conf.test, tests/cdemo-exec.test,
tests/cdemo-make.test, tests/cdemo-shared.test,
tests/cdemo-static.test, tests/cdemo-undef.test,
tests/demo-conf.test, tests/demo-deplibs.test,
tests/demo-exec.test, tests/demo-hardcode.test,
tests/demo-inst.test, tests/demo-make.test,
tests/demo-nofast.test, tests/demo-noinst-link.test,
tests/demo-nopic.test, tests/demo-pic.test,
tests/demo-relink.test, tests/demo-shared.test,
tests/demo-static.test, tests/demo-unst.test,
tests/depdemo-conf.test, tests/depdemo-exec.test,
tests/depdemo-inst.test, tests/depdemo-make.test,
tests/depdemo-nofast.test, tests/depdemo-relink.test,
tests/depdemo-shared.test, tests/depdemo-static.test,
tests/depdemo-unst.test, tests/f77demo-conf.test,
tests/f77demo-exec.test, tests/f77demo-make.test,
tests/f77demo-shared.test, tests/f77demo-static.test,
tests/link-2.test, tests/link.test, tests/mdemo-conf.test,
tests/mdemo-dryrun.test, tests/mdemo-exec.test,
tests/mdemo-inst.test, tests/mdemo-make.test,
tests/mdemo-shared.test, tests/mdemo-static.test,
tests/mdemo-unst.test, tests/mdemo2-conf.test,
tests/mdemo2-exec.test, tests/mdemo2-make.test, tests/nomode.test,
tests/objectlist.test, tests/pdemo-conf.test,
tests/pdemo-exec.test, tests/pdemo-inst.test,
tests/pdemo-make.test, tests/quote.test, tests/sh.test,
tests/suffix.test, tests/tagdemo-conf.test,
tests/tagdemo-exec.test, tests/tagdemo-make.test,
tests/tagdemo-shared.test, tests/tagdemo-static.test,
tests/tagdemo-undef.test, tests/tagtrace.test (func_cd,
func_require): Adjust paths..

70 files changed:
ChangeLog
Makefile.am
bootstrap
configure.ac
doc/Makefile.am [deleted file]
tests/Makefile.am [deleted file]
tests/cdemo-conf.test
tests/cdemo-exec.test
tests/cdemo-make.test
tests/cdemo-shared.test
tests/cdemo-static.test
tests/cdemo-undef.test
tests/defs.m4sh
tests/demo-conf.test
tests/demo-deplibs.test
tests/demo-exec.test
tests/demo-hardcode.test
tests/demo-inst.test
tests/demo-make.test
tests/demo-nofast.test
tests/demo-noinst-link.test
tests/demo-nopic.test
tests/demo-pic.test
tests/demo-relink.test
tests/demo-shared.test
tests/demo-static.test
tests/demo-unst.test
tests/depdemo-conf.test
tests/depdemo-exec.test
tests/depdemo-inst.test
tests/depdemo-make.test
tests/depdemo-nofast.test
tests/depdemo-relink.test
tests/depdemo-shared.test
tests/depdemo-static.test
tests/depdemo-unst.test
tests/f77demo-conf.test
tests/f77demo-exec.test
tests/f77demo-make.test
tests/f77demo-shared.test
tests/f77demo-static.test
tests/link-2.test
tests/link.test
tests/mdemo-conf.test
tests/mdemo-dryrun.test
tests/mdemo-exec.test
tests/mdemo-inst.test
tests/mdemo-make.test
tests/mdemo-shared.test
tests/mdemo-static.test
tests/mdemo-unst.test
tests/mdemo2-conf.test
tests/mdemo2-exec.test
tests/mdemo2-make.test
tests/nomode.test
tests/objectlist.test
tests/pdemo-conf.test
tests/pdemo-exec.test
tests/pdemo-inst.test
tests/pdemo-make.test
tests/quote.test
tests/sh.test
tests/suffix.test
tests/tagdemo-conf.test
tests/tagdemo-exec.test
tests/tagdemo-make.test
tests/tagdemo-shared.test
tests/tagdemo-static.test
tests/tagdemo-undef.test
tests/tagtrace.test

index e925d7a3848c8a8c1d185a5d8ff4ef8d2afb4aea..ed595fa0a1ea9be10612993cf9aaa972ac5503b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,59 @@
+2005-04-13  Gary V. Vaughan  <gary@gnu.org>
+
+       Since the bootstrap process requires that several of the rules for
+       files generated in doc and tests already lived in
+       $top_srcdir/Makefile.am, along with proxy rules in sub-Makefiles,
+       this changeset consolidates almost everything into the top
+       Makefile.am, simplifying things considerably:
+
+       * doc/Makefile.am, tests/Makefile.am: Removed.  All rules moved...
+       * Makefile.am: ...to here and adjusted to run from $top_builddir.
+       Some reformatting to group rules and declarations by purpose, and
+       simplify with respect to removing much of the make recursion.
+       Add `doc/PLATFORMS', `doc/fdl.texi' and `doc/notes.texi'.
+       `defs.in' and `defs.m4sh' are in directory `tests'.
+       (uninstall-hook): Don't forget to uninstall libtoolize's libltdl
+       source tree.
+       * bootstrap: Simplified dirty makefile management, and bootstrap
+       file creation in light of having only a single pertinent
+       Makefile.
+       * configure.ac (CONF_SUBDIRS): Add tests/ prefix to each subdir to
+       compensate.
+       (DIST_MAKEFILE_LIST): Adjust.
+       (AC_CONFIG_FILES): Remove doc/Makefile and tests/Makefile.
+       * tests/defs.m4sh (LIBTOOL, scripts): Adjust paths.
+       * tests/cdemo-conf.test, tests/cdemo-exec.test,
+       tests/cdemo-make.test, tests/cdemo-shared.test,
+       tests/cdemo-static.test, tests/cdemo-undef.test,
+       tests/demo-conf.test, tests/demo-deplibs.test,
+       tests/demo-exec.test, tests/demo-hardcode.test,
+       tests/demo-inst.test, tests/demo-make.test,
+       tests/demo-nofast.test, tests/demo-noinst-link.test,
+       tests/demo-nopic.test, tests/demo-pic.test,
+       tests/demo-relink.test, tests/demo-shared.test,
+       tests/demo-static.test, tests/demo-unst.test,
+       tests/depdemo-conf.test, tests/depdemo-exec.test,
+       tests/depdemo-inst.test, tests/depdemo-make.test,
+       tests/depdemo-nofast.test, tests/depdemo-relink.test,
+       tests/depdemo-shared.test, tests/depdemo-static.test,
+       tests/depdemo-unst.test, tests/f77demo-conf.test,
+       tests/f77demo-exec.test, tests/f77demo-make.test,
+       tests/f77demo-shared.test, tests/f77demo-static.test,
+       tests/link-2.test, tests/link.test, tests/mdemo-conf.test,
+       tests/mdemo-dryrun.test, tests/mdemo-exec.test,
+       tests/mdemo-inst.test, tests/mdemo-make.test,
+       tests/mdemo-shared.test, tests/mdemo-static.test,
+       tests/mdemo-unst.test, tests/mdemo2-conf.test,
+       tests/mdemo2-exec.test, tests/mdemo2-make.test, tests/nomode.test,
+       tests/objectlist.test, tests/pdemo-conf.test,
+       tests/pdemo-exec.test, tests/pdemo-inst.test,
+       tests/pdemo-make.test, tests/quote.test, tests/sh.test,
+       tests/suffix.test, tests/tagdemo-conf.test,
+       tests/tagdemo-exec.test, tests/tagdemo-make.test,
+       tests/tagdemo-shared.test, tests/tagdemo-static.test,
+       tests/tagdemo-undef.test, tests/tagtrace.test (func_cd,
+       func_require): Adjust paths..
+
 2005-04-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * config/general.m4sh, libtool.m4 (_LT_SETUP), tests/defs.m4sh,
 
 2005-04-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
-       Improved Portland support: prelinking of C++ templates and whole_archive.
+       Improved Portland support: prelinking of C++ templates and
+       whole_archive.
 
        * m4/libtool.m4 (_LT_COMPILER_PIC, _LT_LINKER_SHLIBS) [ linux ]:
        Reinstate formatted whole_archive_flag_spec for PGI compilers.
-       * config/ltmain.m4sh (func_mode_link), m4/libtool.m4 (_LT_LINKER_SHLIBS):
-       New tag prelink_cmds, to be executed before linking a program.
+       * config/ltmain.m4sh (func_mode_link), m4/libtool.m4
+       (_LT_LINKER_SHLIBS): New tag prelink_cmds, to be executed before
+       linking a program.
        (_LT_LANG_CXX_CONFIG) [ linux ]: Use for pgCC.
-       (_LT_COMPILER_C_O): conftest might be nonempty, clean up more thoroughly.
+       (_LT_COMPILER_C_O): conftest might be nonempty, clean up more
+       thoroughly.
 
        * tests/testsuite.at (LT_AT_BOOTSTRAP): Temporary fix for testing
        in-tree libtoolize.
@@ -29,7 +88,8 @@
 
        * notes.texi: Platform-specific configuration notes.
        * doc/libtool.texi: Include as section.
-       * bootstrap, doc/Makefile.am: build also as notes.txt and distribute.
+       * bootstrap, doc/Makefile.am: build also as notes.txt and
+       distribute.
 
 2005-04-04  Gary V. Vaughan  <gary@gnu.org>
 
index b748069cbdef6dc169112c0a27c9d03a58f64a9a..0a199b385a19da499caf59703eb688a3c72ec162 100644 (file)
 
 ACLOCAL_AMFLAGS  = -I m4
 
+BUILD_SUBDIRS  = . libltdl
+SUBDIRS                = $(BUILD_SUBDIRS)
+DIST_SUBDIRS   = $(BUILD_SUBDIRS)
+EXTRA_DIST     =
+
+
+## ---------------- ##
+## Libtool scripts. ##
+## ---------------- ##
+
+# The libtool distributor and the standalone libtool script.
+bin_SCRIPTS = libtoolize libtool
+
+libtoolize: $(srcdir)/libtoolize.in
+       rm -f libtoolize.tmp libtoolize
+       $(timestamp); \
+       input="libtoolize.m4sh"; \
+       $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
+               -e 's,@nobase_pkgvdata_DATA\@,$(nobase_pkgvdata_DATA),g' \
+               -e "s,@pkgvltdl_files\@,`echo $(ltdldatafiles)`,g" \
+               $(srcdir)/libtoolize.in > libtoolize.tmp
+       chmod a+x libtoolize.tmp
+       chmod a-w libtoolize.tmp
+       mv -f libtoolize.tmp libtoolize
+
+# Use `$(srcdir)' for the benefit of non-GNU makes: this is
+# how libtoolize.in appears in our dependencies.
+EXTRA_DIST += libtoolize.m4sh
+$(srcdir)/libtoolize.in: $(sh_files) libtoolize.m4sh Makefile.am
+       cd $(srcdir); \
+       rm -f libtoolize.in; \
+       $(M4SH) -B ./config libtoolize.m4sh > libtoolize.in
+
+libtool: $(top_builddir)/config.status $(srcdir)/config/ltmain.sh \
+        $(srcdir)/stamp-vcl
+       cd $(top_builddir) && $(SHELL) ./config.status $@
+
+.PHONY: configure-subdirs
+configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
+@DIST_MAKEFILE_LIST@:
+       dir=`echo $@ | sed 's,^[^/]*$$,.,;s,/[^/]*$$,,'`; \
+       test -d $$dir || mkdir $$dir || exit 1; \
+       abs_srcdir=`cd $(srcdir) && pwd`; \
+       (cd $$dir && $$abs_srcdir/$$dir/configure) || exit 1
+
+
+# ---------- #
+# Bootstrap. #
+# ---------- #
+
 edit = sed \
        -e 's,@EGREP\@,$(EGREP),g' \
        -e 's,@FGREP\@,$(FGREP),g' \
@@ -45,39 +95,20 @@ edit = sed \
        -e 's,@prefix\@,$(prefix),g' \
        -e "s,@configure_input\@,Generated from $$input; do not edit by hand,g"
 
-timestamp = set dummy `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; shift; \
+timestamp = set dummy `$(MKSTAMP) < $(srcdir)/ChangeLog`; shift; \
        case $(VERSION) in \
          *[acegikmoqsuwy]) TIMESTAMP=" $$1 $$2 $$3" ;; \
          *) TIMESTAMP="" ;; \
        esac
 
-BUILD_SUBDIRS = . libltdl doc tests
-SUBDIRS = $(BUILD_SUBDIRS)
-DIST_SUBDIRS = $(BUILD_SUBDIRS)
-
-sh_files = config/general.m4sh config/getopt.m4sh
-EXTRA_DIST = bootstrap libtoolize.in config/ltmain.m4sh config/mkstamp \
-       $(sh_files) stamp-vcl ChangeLog.1996 ChangeLog.1997 ChangeLog.1998 \
-       ChangeLog.1999 ChangeLog.2000 ChangeLog.2001 ChangeLog.2002 \
-       ChangeLog.2003
-CLEANFILES = libtool libtoolize \
-       libtoolize.tmp config/ltmain.tmp m4/ltversion.tmp
-
-## This properly belongs in tests/Makefile.am, but then we would have
-## to pass $(edit) to the submake or, worse, keep two copies of $(edit)
-## in synch, so instead we just build it from this Makefile.am:
-.PHONY: update-package-m4
-update-package-m4: $(top_srcdir)/tests/package.m4
-$(top_srcdir)/tests/package.m4: $(top_srcdir)/configure.ac
-       cd $(top_srcdir); \
-       {                                       \
-         echo '# Signature of the current package.'; \
-         echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
-         echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
-         echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
-         echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
-         echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
-       } | $(edit) > tests/package.m4
+sh_files       = config/general.m4sh config/getopt.m4sh
+EXTRA_DIST     += bootstrap libtoolize.in config/ltmain.m4sh config/mkstamp \
+                 $(sh_files) stamp-vcl ChangeLog.1996 ChangeLog.1997 \
+                 ChangeLog.1998 ChangeLog.1999 ChangeLog.2000 ChangeLog.2001 \
+                 ChangeLog.2002 ChangeLog.2003
+CLEANFILES     = libtool libtoolize \
+                 libtoolize.tmp config/ltmain.tmp m4/ltversion.tmp
+DISTCLEANFILES =
 
 # These are required by libtoolize and must be executable when installed.
 # Since _SCRIPTS gets the program transform applied we make them
@@ -90,18 +121,18 @@ nobase_dist_pkgvdata_DATA = config/config.guess config/config.sub \
 nobase_pkgvdata_DATA = m4/argz.m4 m4/libtool.m4 m4/ltdl.m4 \
        m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4
 
-## We know that $(top_srcdir)/ChangeLog has been edited if stamp-vcl
-## needs updating, so we assume we have write access to $(top_srcdir).
+## We know that $(srcdir)/ChangeLog has been edited if stamp-vcl
+## needs updating, so we assume we have write access to $(srcdir).
 ## If we try to maintain ./stamp-vcl to avoid writing to a possibly
-## read-only $(top_srcdir), then when the two stamp-vcls differ, distcheck
+## read-only $(srcdir), then when the two stamp-vcls differ, distcheck
 ## will try to update the one in the read-only source tree it makes.
-MKSTAMP = $(SHELL) $(top_srcdir)/config/mkstamp
-$(top_srcdir)/stamp-vcl: vcl-tmp clean-ltmain-sh ChangeLog
+MKSTAMP = $(SHELL) $(srcdir)/config/mkstamp
+$(srcdir)/stamp-vcl: vcl-tmp clean-ltmain-sh ChangeLog
 vcl-tmp:
-       @set dummy `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; shift; \
+       @set dummy `$(MKSTAMP) < $(srcdir)/ChangeLog`; shift; \
        echo "$$1" > vcl.tmp; \
-       cmp -s vcl.tmp $(top_srcdir)/stamp-vcl \
-         || (echo "Updating stamp-vcl"; cp vcl.tmp $(top_srcdir)/stamp-vcl)
+       cmp -s vcl.tmp $(srcdir)/stamp-vcl \
+         || (echo "Updating stamp-vcl"; cp vcl.tmp $(srcdir)/stamp-vcl)
        -@rm -f vcl.tmp
 
 ## We used to build ltmain.sh in the build tree, but now it is created
@@ -109,7 +140,7 @@ vcl-tmp:
 ## previous builds left behind in the build tree, that would override the
 ## source tree version in current builds.
 clean-ltmain-sh:
-       @-test "$(top_srcdir)" = "$(top_builddir)" || \
+       @-test "$(srcdir)" = "$(top_builddir)" || \
          rm -f "$(top_builddir)/config/ltmain.sh"
 
 # We build ltversion.m4 here, instead of from config.status,
@@ -117,12 +148,12 @@ clean-ltmain-sh:
 # dependencies change and ltversion.m4 happens to be a configure
 # dependency.  configure and ltversion.m4 would be rebuilt in
 # a loop otherwise.
-# Use `$(top_srcdir)/m4' for the benefit of non-GNU makes: this is
+# Use `$(srcdir)/m4' for the benefit of non-GNU makes: this is
 # how ltversion.m4 appears in our dependencies.
 EXTRA_DIST += m4/ltversion.in m4/ltversion.m4
-$(top_srcdir)/m4/ltversion.m4: m4/ltversion.in configure.ac $(top_srcdir)/stamp-vcl
-       set dummy `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; shift; \
-       cd $(top_srcdir); \
+$(srcdir)/m4/ltversion.m4: m4/ltversion.in configure.ac $(srcdir)/stamp-vcl
+       set dummy `$(MKSTAMP) < $(srcdir)/ChangeLog`; shift; \
+       cd $(srcdir); \
        rm -f m4/ltversion.tmp; \
        serial=`echo $$1 | sed 's,^1[.],,g'`; \
        input="ltversion.in"; \
@@ -134,16 +165,16 @@ $(top_srcdir)/m4/ltversion.m4: m4/ltversion.in configure.ac $(top_srcdir)/stamp-
 
 ## And for similar reasons, ltmain.sh can't be built from config.status.
 ## !WARNING! If you edit this rule to change the contents of ltmain.sh,
-##           you must `touch $(top_srcdir)/config/ltmain.in' from the
+##           you must `touch $(srcdir)/config/ltmain.in' from the
 ##           shell if you need ltmain.sh to be regenerated.  Ideally, we
 ##           should make this rule depend on Makefile but that will break
 ##           distcheck (at least) by rebuilding ltmain.sh in the source
 ##           tree whenever config.status regenerates the Makefile.
 EXTRA_DIST += config/ltmain.sh
-$(top_srcdir)/config/ltmain.sh: $(sh_files) config/ltmain.m4sh configure.ac \
-                               $(top_srcdir)/stamp-vcl
+$(srcdir)/config/ltmain.sh: $(sh_files) config/ltmain.m4sh configure.ac \
+                               $(srcdir)/stamp-vcl
        $(timestamp); \
-       cd $(top_srcdir); \
+       cd $(srcdir); \
        rm -f config/ltmain.in config/ltmain.tmp config/ltmain.sh; \
        $(M4SH) -B ./config config/ltmain.m4sh > config/ltmain.in; \
        input="ltmain.m4sh"; \
@@ -154,63 +185,25 @@ $(top_srcdir)/config/ltmain.sh: $(sh_files) config/ltmain.m4sh configure.ac \
        chmod a-w config/ltmain.tmp; \
        mv -f config/ltmain.tmp config/ltmain.sh
 
-# The libtool distributor and the standalone libtool script.
-bin_SCRIPTS = libtoolize libtool
 
-libtoolize: $(top_srcdir)/libtoolize.in
-       rm -f libtoolize.tmp libtoolize
-       $(timestamp); \
-       input="libtoolize.m4sh"; \
-       $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
-               -e 's,@nobase_pkgvdata_DATA\@,$(nobase_pkgvdata_DATA),g' \
-               -e "s,@pkgvltdl_files\@,`echo $(ltdldatafiles)`,g" \
-               $(top_srcdir)/libtoolize.in > libtoolize.tmp
-       chmod a+x libtoolize.tmp
-       chmod a-w libtoolize.tmp
-       mv -f libtoolize.tmp libtoolize
+## -------------- ##
+## Documentation. ##
+## -------------- ##
 
-# Use `$(top_srcdir)' for the benefit of non-GNU makes: this is
-# how libtoolize.in appears in our dependencies.
-EXTRA_DIST += libtoolize.m4sh
-$(top_srcdir)/libtoolize.in: $(sh_files) libtoolize.m4sh Makefile.am
-       cd $(top_srcdir); \
-       rm -f libtoolize.in; \
-       $(M4SH) -B ./config libtoolize.m4sh > libtoolize.in
+info_TEXINFOS          = doc/libtool.texi
+libtool_TEXINFOS       = doc/PLATFORMS doc/fdl.texi doc/notes.texi
+EXTRA_DIST            += doc/notes.txt $(libtool_TEXINFOS)
 
-# The defs script shouldn't be recreated whenever the Makefile is
-# regenerated since the source tree can be read-only.
-check-recursive: tests/defs $(top_srcdir)/tests/testsuite
-tests/defs: $(top_srcdir)/tests/defs.in
-       rm -f tests/defs.tmp tests/defs; \
-       input="defs.m4sh"; \
-       $(edit) $(top_srcdir)/tests/defs.in > tests/defs.tmp; \
-       mv -f tests/defs.tmp tests/defs
+all-local: $(srcdir)/doc/notes.txt
 
-# Use `$(top_srcdir)/tests' for the benefit of non-GNU makes: this is
-# how defs.in appears in our dependencies.
-# No need to EXTRA_DIST defs.m4sh here, that is handled in tests/Makefile.am.
-$(top_srcdir)/tests/defs.in: config/general.m4sh tests/defs.m4sh Makefile.am
-       cd $(top_srcdir); \
-       rm -f tests/defs.in; \
-       $(M4SH) -B ./config tests/defs.m4sh > tests/defs.in
+$(srcdir)/doc/notes.txt: $(srcdir)/doc/notes.texi
+       cd $(srcdir)/doc && \
+         $(MAKEINFO) --plaintext $(MAKEINFOFLAGS) -o notes.txt notes.texi
 
-$(top_srcdir)/tests/testsuite:
-       cd tests; \
-       $(MAKE) $(AM_MAKEFLAGS) testsuite
 
-# Automake doesn't want us to generate distributed files from config.status,
-# but the alternative (see libtool-1.4.3) was even uglier!
-libtool: $(top_builddir)/config.status $(top_srcdir)/config/ltmain.sh \
-        $(top_srcdir)/stamp-vcl
-       cd $(top_builddir) && $(SHELL) ./config.status $@
-
-.PHONY: configure-subdirs
-configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
-@DIST_MAKEFILE_LIST@:
-       dir=`echo $@ | sed 's,^[^/]*$$,.,;s,/[^/]*$$,,'`; \
-       test -d $$dir || mkdir $$dir || exit 1; \
-       abs_srcdir=`cd $(top_srcdir) && pwd`; \
-       (cd $$dir && $$abs_srcdir/$$dir/configure) || exit 1
+## ------------- ##
+## Installation. ##
+## ------------- ##
 
 ## These are installed as a subdirectory of pkgdatadir so that
 ## libtoolize --ltdl can find them later:
@@ -262,6 +255,11 @@ install-data-hook:
        chmod +x $(DESTDIR)$(pkgvdatadir)/config/config.sub
        chmod +x $(DESTDIR)$(pkgvdatadir)/config/install-sh
 
+
+## ------------- ##
+## Distribution. ##
+## ------------- ##
+
 ## Make versioned links.  We only run the transform on the root name;
 ## then we make a versioned link with the transformed base name.  This
 ## seemed like the most reasonable approach.
@@ -281,6 +279,11 @@ uninstall-hook:
          fv="$$f-$(APIVERSION)"; \
          rm -f $(DESTDIR)$(bindir)/$$fv; \
        done
+       @for f in $(ltdldatafiles); do \
+         echo " rm -rf '$(DESTDIR)$(ltdldatadir)/$$f'"; \
+         rm -f "$(DESTDIR)$(ltdldatadir)/$$f"; \
+       done
+
 
 ## Ship README.alpha only in alpha release, but renamed to README
 dist-hook:
@@ -289,3 +292,182 @@ dist-hook:
          *[a-z]) mv $(distdir)/README.alpha $(distdir)/README ;; \
          *)      rm -f $(distdir)/README.alpha ;; \
        esac
+
+
+## ----------- ##
+## Test suite. ##
+## ----------- ##
+
+TESTSUITE      = tests/testsuite
+TESTSUITE_AT   = tests/testsuite.at \
+                 tests/am-subdir.at \
+                 tests/functests.at \
+                 tests/inherited_flags.at \
+                 tests/libtoolize.at \
+                 tests/stresstest.at \
+                 tests/template.at
+
+EXTRA_DIST     += $(TESTSUITE) $(TESTSUITE_AT) tests/package.m4
+
+# Be sure to reexport important environment variables:
+TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
+       CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
+       LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
+       OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" CONFIG_SHELL="$(SHELL)" \
+       CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" CXXCPP="$(CXXCPP)" \
+       F77="$(F77)" FFLAGS="$(FFLAGS)"
+
+check-recursive: $(srcdir)/$(TESTSUITE)
+
+# Use `$(srcdir)' for the benefit of non-GNU makes: this is
+# how `testsuite' appears in our dependencies.
+$(srcdir)/$(TESTSUITE): tests/package.m4 $(TESTSUITE_AT)
+       cd $(srcdir)/tests; \
+       $(AUTOTEST) testsuite.at -o testsuite
+
+$(srcdir)/tests/package.m4: $(srcdir)/configure.ac
+       { \
+         echo '# Signature of the current package.'; \
+         echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
+         echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
+         echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
+         echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
+         echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+       } | $(edit) > $(srcdir)/tests/package.m4
+
+tests/atconfig: config.status
+       $(SHELL) ./config.status tests/atconfig
+DISTCLEANFILES += tests/atconfig
+
+# Hook the test suite into the check rule
+check-local: tests/atconfig $(srcdir)/$(TESTSUITE)
+       abs_srcdir=`cd $(srcdir); pwd`; \
+       cd tests; \
+       $(TESTS_ENVIRONMENT) $(SHELL) $$abs_srcdir/$(TESTSUITE) $(TESTSUITE_FLAGS)
+
+# Run the test suite on the *installed* tree.
+installcheck-local:
+       abs_srcdir=`cd $(srcdir); pwd`; \
+       cd tests; \
+       $(TESTS_ENVIRONMENT) $(SHELL) $$abs_srcdir/$(TESTSUITE) $(TESTSUITE_FLAGS) AUTOTEST_PATH=$(exec_prefix)/bin
+
+# We need to remove any file droppings left behind by testsuite
+clean-local: clean-local-legacy
+       -abs_srcdir=`cd $(srcdir); pwd`; \
+       cd tests; \
+       test -f $$abs_srcdir/$(TESTSUITE) && \
+           $(SHELL) $$abs_srcdir/$(TESTSUITE) --clean
+
+
+## ------------- ##
+## Legacy tests. ##
+## ------------- ##
+
+# !WARNING! Don't add any new tests here, we are migrating to an
+#           Autotest driven framework, please add new test cases
+#           using the new framework above.  When the migration is
+#           complete this section should be removed.
+
+CXX_TESTS = \
+       tests/tagdemo-static.test tests/tagdemo-make.test \
+       tests/tagdemo-exec.test tests/tagdemo-conf.test \
+       tests/tagdemo-make.test tests/tagdemo-exec.test \
+       tests/tagdemo-shared.test tests/tagdemo-make.test \
+       tests/tagdemo-exec.test tests/tagdemo-undef.test \
+       tests/tagdemo-make.test tests/tagdemo-exec.test
+
+F77_TESTS = \
+       tests/f77demo-static.test tests/f77demo-make.test \
+       tests/f77demo-exec.test tests/f77demo-conf.test \
+       tests/f77demo-make.test tests/f77demo-exec.test \
+       tests/f77demo-shared.test tests/f77demo-make.test \
+       tests/f77demo-exec.test
+
+COMMON_TESTS = \
+       tests/link.test tests/link-2.test tests/nomode.test \
+       tests/objectlist.test tests/quote.test tests/sh.test \
+       tests/suffix.test tests/tagtrace.test \
+       tests/cdemo-static.test tests/cdemo-make.test tests/cdemo-exec.test \
+       tests/demo-static.test tests/demo-make.test tests/demo-exec.test \
+       tests/demo-inst.test tests/demo-unst.test \
+       tests/depdemo-static.test tests/depdemo-make.test \
+       tests/depdemo-exec.test tests/depdemo-inst.test \
+       tests/depdemo-unst.test \
+       tests/mdemo-static.test tests/mdemo-make.test tests/mdemo-exec.test \
+       tests/mdemo-inst.test tests/mdemo-unst.test \
+       tests/cdemo-conf.test tests/cdemo-make.test tests/cdemo-exec.test \
+       tests/demo-conf.test tests/demo-make.test tests/demo-exec.test \
+       tests/demo-inst.test tests/demo-unst.test tests/demo-deplibs.test \
+       tests/depdemo-conf.test tests/depdemo-make.test \
+       tests/depdemo-exec.test tests/depdemo-inst.test \
+       tests/depdemo-unst.test \
+       tests/mdemo-conf.test tests/mdemo-make.test tests/mdemo-exec.test \
+       tests/mdemo-inst.test tests/mdemo-unst.test tests/mdemo-dryrun.test \
+       tests/mdemo2-conf.test tests/mdemo2-make.test tests/mdemo2-exec.test \
+       tests/pdemo-conf.test tests/pdemo-make.test tests/pdemo-exec.test \
+       tests/pdemo-inst.test \
+       tests/demo-nofast.test tests/demo-make.test tests/demo-exec.test \
+       tests/demo-inst.test tests/demo-unst.test \
+       tests/depdemo-nofast.test tests/depdemo-make.test \
+       tests/depdemo-exec.test tests/depdemo-inst.test \
+       tests/depdemo-unst.test \
+       tests/demo-pic.test tests/demo-make.test tests/demo-exec.test \
+       tests/demo-nopic.test tests/demo-make.test tests/demo-exec.test \
+       tests/cdemo-shared.test tests/cdemo-make.test tests/cdemo-exec.test \
+       tests/demo-shared.test tests/demo-make.test tests/demo-exec.test \
+       tests/demo-inst.test tests/demo-hardcode.test tests/demo-relink.test \
+       tests/demo-noinst-link.test tests/demo-unst.test \
+       tests/depdemo-shared.test tests/depdemo-make.test \
+       tests/depdemo-exec.test tests/depdemo-inst.test \
+       tests/depdemo-relink.test tests/depdemo-unst.test \
+       tests/mdemo-shared.test tests/mdemo-make.test tests/mdemo-exec.test \
+       tests/mdemo-inst.test tests/mdemo-unst.test \
+       tests/cdemo-undef.test tests/cdemo-make.test tests/cdemo-exec.test
+
+if HAVE_CXX
+if HAVE_F77
+TESTS = $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS)
+else
+TESTS = $(COMMON_TESTS) $(CXX_TESTS)
+endif
+else
+if HAVE_F77
+TESTS = $(COMMON_TESTS) $(F77_TESTS)
+else
+TESTS = $(COMMON_TESTS)
+endif
+endif
+
+tests/demo-conf.test: libtool
+
+EXTRA_DIST     += tests/defs.in tests/defs.m4sh \
+                 $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS)
+DIST_SUBDIRS   += $(CONF_SUBDIRS)
+
+# The defs script shouldn't be recreated whenever the Makefile is
+# regenerated since the source tree can be read-only.
+check-recursive: tests/defs
+tests/defs: $(srcdir)/tests/defs.in
+       rm -f tests/defs.tmp tests/defs; \
+       input="defs.m4sh"; \
+       $(edit) $(srcdir)/tests/defs.in > tests/defs.tmp; \
+       mv -f tests/defs.tmp tests/defs
+
+# Use `$(srcdir)/tests' for the benefit of non-GNU makes: this is
+# how defs.in appears in our dependencies.
+$(srcdir)/tests/defs.in: config/general.m4sh tests/defs.m4sh Makefile.am
+       cd $(srcdir); \
+       rm -f tests/defs.in; \
+       $(M4SH) -B ./config tests/defs.m4sh > tests/defs.in
+
+# We need to remove any files that the above tests created.
+clean-local-legacy:
+       -cd tests; \
+       for dir in cdemo demo depdemo f77demo mdemo mdemo2 pdemo tagdemo; \
+       do \
+           test -f $$dir/Makefile && ( cd $$dir && $(MAKE) distclean; ); \
+       done
+       rm -rf _inst
+
+$(TESTS): tests/defs
+DISTCLEANFILES += tests/defs
index ae58fb2928b3e0943b9769356207ec8443c838de..089fd13c3dbd1c418c26bf03c7546f32583bebc4 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -62,15 +62,9 @@ fi
 set dummy `$SED '/AC_INIT/{s/[][,()]/ /g; p;};d' configure.ac`
 shift
 
-# Whip up some dirty Makefiles:
-makefiles=
-for dirty in ./Makefile ./tests/Makefile ./doc/Makefile
-do
-  test -f $dirty || {
-    makefiles="$makefiles $dirty"
-    $SED '/^if /,/^endif$/d;/^else$/,/^endif$/d' $dirty.am > $dirty
-  }
-done
+# Whip up a dirty Makefile:
+test -f Makefile \
+  || $SED '/^if /,/^endif$/d;/^else$/,/^endif$/d' Makefile.am > Makefile
 
 # Building distributed files from configure is bad for automake, so we
 # generate them here, and have Makefile rules to keep them up to date.
@@ -79,28 +73,17 @@ done
 # configure, and ltversion.m4 to generate configure in the first place:
 rm -f ./config/ltmain.sh ./m4/ltversion.m4
 
-
-$MAKE ./config/ltmain.sh ./m4/ltversion.m4 ./libtoolize.in ./tests/defs.in \
+$MAKE ./config/ltmain.sh ./doc/notes.txt ./m4/ltversion.m4 ./libtoolize.in \
+    ./tests/defs.in ./tests/package.m4 ./tests/testsuite \
     srcdir=. top_srcdir=. PACKAGE="$2" VERSION="$3" \
-    M4SH="$AUTOM4TE --language=m4sh"
-
-{
-  $MAKE update-package-m4 srcdir=. top_srcdir=. \
-    PACKAGE="$2" VERSION="$3" PACKAGE_BUGREPORT="bug-$2@gnu.org"
-  cd tests
-  $MAKE ./testsuite AUTOTEST="$AUTOM4TE --language=autotest" \
-    srcdir=. top_srcdir=.. PACKAGE="$2" VERSION="$3"
-  cd ..
-  cd doc
-  $MAKE notes.txt srcdir=. top_srcdir=.. MAKEINFO="${MAKEINFO}"
-  cd ..
-}
+    PACKAGE_BUGREPORT="bug-$2@gnu.org" M4SH="$AUTOM4TE --language=m4sh" \
+    AUTOTEST="$AUTOM4TE --language=autotest" MAKEINFO="$MAKEINFO"
 
 test -f clcommit.m4sh && $MAKE -f Makefile.maint commit \
     top_srcdir=. PACKAGE="$2" VERSION="$3" M4SH="$AUTOM4TE -l m4sh" \
-    SED="$SED" GREP="$GREP" FGREP="$FGREP" EGREP="${EGREP}" LN_S="$LN_S"
+    SED="$SED" GREP="$GREP" FGREP="$FGREP" EGREP="$EGREP" LN_S="$LN_S"
 
-test -z "$makefiles" || rm -f $makefiles
+rm -f Makefile
 
 # Make a dummy libtoolize script for autoreconf:
 test -f clcommit.m4sh && cat > ./config/libtoolize <<'EOF'
index 292fdac8e56523999ade70731f3ec4f07318e840..26af26252f4f58869221fc3ae771269e151626dd 100644 (file)
@@ -144,14 +144,14 @@ if test x"${enable_ltdl_install+set}" != xset; then
 fi
 
 # All subdirectories that are configured on demand, but that must be
-# included in the distribution.  This substitution is for tests/Makefile.am,
-# so the directory names are relative to that directory.
-CONF_SUBDIRS="cdemo demo depdemo f77demo mdemo mdemo2 pdemo tagdemo"
+# included in the distribution.
+CONF_SUBDIRS="tests/cdemo tests/demo tests/depdemo tests/f77demo tests/mdemo \
+       tests/mdemo2 tests/pdemo tests/tagdemo"
 AC_SUBST([CONF_SUBDIRS])
 
 DIST_MAKEFILE_LIST=
 for dir in $CONF_SUBDIRS; do
-  DIST_MAKEFILE_LIST="${DIST_MAKEFILE_LIST}tests/$dir/Makefile "
+  DIST_MAKEFILE_LIST="${DIST_MAKEFILE_LIST}$dir/Makefile "
 done
 AC_SUBST([DIST_MAKEFILE_LIST])
 
@@ -208,5 +208,5 @@ AM_CONDITIONAL(HAVE_RC, [test -n "[$]_LT_TAGVAR(compiler, RC)"])
 ## -------- ##
 ## Outputs. ##
 ## -------- ##
-AC_CONFIG_FILES([Makefile libltdl/Makefile doc/Makefile tests/Makefile])
+AC_CONFIG_FILES([Makefile libltdl/Makefile])
 AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644 (file)
index 1668a20..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-info_TEXINFOS = libtool.texi
-libtool_TEXINFOS = PLATFORMS fdl.texi notes.texi
-EXTRA_DIST = notes.txt
-
-all-local: notes.txt
-
-notes.txt: notes.texi
-       cd $(srcdir) && $(MAKEINFO) --plaintext $(MAKEINFOFLAGS) -o $@ notes.texi
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644 (file)
index 55a255c..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-## Makefile.am -- Process this file with automake to produce Makefile.in
-##
-## Copyright (C) 2003, 2004, 2005 Free Software Foundation
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; see the file COPYING.  If not, write to
-## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
-
-## ------------ ##
-## Test suite.  ##
-## ------------ ##
-
-TESTSUITE      = testsuite
-TESTSUITE_AT   = testsuite.at \
-                 am-subdir.at \
-                 functests.at \
-                 inherited_flags.at \
-                 libtoolize.at \
-                 stresstest.at \
-                 template.at
-
-EXTRA_DIST     = $(TESTSUITE) $(TESTSUITE_AT) package.m4
-
-# Be sure to reexport important environment variables:
-TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
-       CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
-       LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
-       OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" CONFIG_SHELL="$(SHELL)" \
-       CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" CXXCPP="$(CXXCPP)" \
-       F77="$(F77)" FFLAGS="$(FFLAGS)"
-
-# ../Makefile knows how to rebuild this file:
-$(srcdir)/package.m4:
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) update-package-m4
-
-$(srcdir)/$(TESTSUITE): $(srcdir)/package.m4 $(TESTSUITE_AT)
-       cd $(srcdir); \
-       $(AUTOTEST) testsuite.at -o $(TESTSUITE)
-
-atconfig: $(top_builddir)/config.status
-       cd $(top_builddir); \
-       ./config.status tests/atconfig
-
-# Hook the test suite into the check rule
-check-local: atconfig $(srcdir)/$(TESTSUITE)
-       $(TESTS_ENVIRONMENT) $(SHELL) $(srcdir)/$(TESTSUITE) $(TESTSUITE_FLAGS)
-
-# Run the test suite on the *installed* tree.
-installcheck-local:
-       $(TESTS_ENVIRONMENT) $(SHELL) $(srcdir)/$(TESTSUITE) $(TESTSUITE_FLAGS) AUTOTEST_PATH=$(exec_prefix)/bin
-
-# We need to remove any file droppings left behind by testsuite
-clean-local: clean-local-legacy
-       -test -f $(srcdir)/$(TESTSUITE) && \
-         $(SHELL) $(srcdir)/$(TESTSUITE) --clean
-
-DISTCLEANFILES = atconfig
-
-## ------------- ##
-## Legacy tests. ##
-## ------------- ##
-
-# !WARNING! Don't add any new tests here, we are migrating to an
-#           Autotest driven framework, please add new test cases
-#           using the new framework above.  When the migration is
-#           complete this section should be removed.
-
-CXX_TESTS = \
-       tagdemo-static.test tagdemo-make.test tagdemo-exec.test \
-       tagdemo-conf.test tagdemo-make.test tagdemo-exec.test \
-       tagdemo-shared.test tagdemo-make.test tagdemo-exec.test \
-       tagdemo-undef.test tagdemo-make.test tagdemo-exec.test
-
-F77_TESTS = \
-       f77demo-static.test f77demo-make.test f77demo-exec.test \
-       f77demo-conf.test f77demo-make.test f77demo-exec.test \
-       f77demo-shared.test f77demo-make.test f77demo-exec.test
-
-COMMON_TESTS = \
-       link.test link-2.test nomode.test objectlist.test \
-       quote.test sh.test suffix.test tagtrace.test \
-       cdemo-static.test cdemo-make.test cdemo-exec.test \
-       demo-static.test demo-make.test demo-exec.test \
-       demo-inst.test demo-unst.test \
-       depdemo-static.test depdemo-make.test depdemo-exec.test \
-       depdemo-inst.test depdemo-unst.test \
-       mdemo-static.test mdemo-make.test mdemo-exec.test \
-       mdemo-inst.test mdemo-unst.test \
-       cdemo-conf.test cdemo-make.test cdemo-exec.test \
-       demo-conf.test demo-make.test demo-exec.test \
-       demo-inst.test demo-unst.test demo-deplibs.test \
-       depdemo-conf.test depdemo-make.test depdemo-exec.test \
-       depdemo-inst.test depdemo-unst.test \
-       mdemo-conf.test mdemo-make.test mdemo-exec.test \
-       mdemo-inst.test mdemo-unst.test mdemo-dryrun.test \
-       mdemo2-conf.test mdemo2-make.test mdemo2-exec.test \
-       pdemo-conf.test pdemo-make.test pdemo-exec.test \
-       pdemo-inst.test \
-       demo-nofast.test demo-make.test demo-exec.test \
-       demo-inst.test demo-unst.test \
-       depdemo-nofast.test depdemo-make.test depdemo-exec.test \
-       depdemo-inst.test depdemo-unst.test \
-       demo-pic.test demo-make.test demo-exec.test \
-       demo-nopic.test demo-make.test demo-exec.test \
-       cdemo-shared.test cdemo-make.test cdemo-exec.test \
-       demo-shared.test demo-make.test demo-exec.test demo-inst.test \
-       demo-hardcode.test demo-relink.test demo-noinst-link.test \
-       demo-unst.test \
-       depdemo-shared.test depdemo-make.test depdemo-exec.test \
-       depdemo-inst.test depdemo-relink.test depdemo-unst.test \
-       mdemo-shared.test mdemo-make.test mdemo-exec.test \
-       mdemo-inst.test mdemo-unst.test \
-       cdemo-undef.test cdemo-make.test cdemo-exec.test
-
-if HAVE_CXX
-if HAVE_F77
-TESTS = $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS)
-else
-TESTS = $(COMMON_TESTS) $(CXX_TESTS)
-endif
-else
-if HAVE_F77
-TESTS = $(COMMON_TESTS) $(F77_TESTS)
-else
-TESTS = $(COMMON_TESTS)
-endif
-endif
-
-demo-conf.test: $(top_builddir)/libtool
-
-$(top_builddir)/libtool:
-       cd $(top_builddir) && $(MAKE) all
-
-EXTRA_DIST += defs.in defs.m4sh $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS)
-DIST_SUBDIRS = $(CONF_SUBDIRS)
-
-# FIXME: Automake-1.7b (at least) only honours DIST_SUBDIRS if SUBDIRS is
-#        also set.  Remove this line when that bug is fixed.
-SUBDIRS = .
-
-# We need to remove any files that the above tests created.
-clean-local-legacy:
-       -for dir in cdemo demo depdemo f77demo mdemo mdemo2 pdemo tagdemo;  \
-       do                                                                  \
-           test -f $$dir/Makefile && ( cd $$dir && $(MAKE) distclean; );   \
-       done
-       rm -rf _inst
-
-$(TESTS): defs
-defs: defs.in $(top_srcdir)/Makefile.am
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) tests/defs
-DISTCLEANFILES += defs
index e697aca1ffd69fcfd08970984d9a711b241e4901..6fc0e3d6878066f98519d9f06f9f027762bf1a49 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "cdemo"
+func_cd "tests/cdemo"
 func_make_distclean
 func_configure
 func_check_static_shared "yes" "yes"
index 6b8c1cff002bde12428fb61f871cdbcf1a1dcf60..bef7af810f85e0ab4139a6ccb402628523d8326a 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "cdemo-make" "cdemo/cdemo$EXEEXT"
+func_require "cdemo-make" "tests/cdemo/cdemo$EXEEXT"
 
 func_rmprefixdir
 func_exec_init "uninstalled"
-func_exec "cdemo/cdemo"
+func_exec "tests/cdemo/cdemo"
 
 exit $exec_status
index f4251634de270271dd0e75de1251be15a8e085c4..9ffa66b749610145b89d5788330fbb6075eb0200 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "cdemo-conf" "cdemo/Makefile"
+func_require "cdemo-conf" "tests/cdemo/Makefile"
 
 func_rmprefixdir
-func_cd "cdemo"
+func_cd "tests/cdemo"
 func_make
 
 exit 0
index d8094990bba08c07783cd54bb784ff8a87b3bee3..f9d05b18c8790d78db1e70b8aacc52259707ac86 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "cdemo"
+func_cd "tests/cdemo"
 func_make_distclean
 func_configure "--disable-static"
 func_check_static_shared "no" "yes"
index 0963d5c7089daad031052bab269cb6d282c74e9d..4d9dacdba092db782899b949f991032a3d8dbee5 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "cdemo"
+func_cd "tests/cdemo"
 func_make_distclean
 func_configure "--disable-shared"
 func_check_static_shared "yes" "no"
index 1c6894748a8622da6568275ad6a4c04ac23d3847..2ec631f09e89977a561c4e9378930228ff109eb4 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "cdemo"
+func_cd "tests/cdemo"
 func_make_distclean
 func_configure "--disable-static"
 
index 53d04550f73aada5680373406e228d7ad3da7a7c..5d99b9b6ba0e32e0d6a0a49455bdeee88dfd1b1c 100644 (file)
@@ -5,7 +5,7 @@ m4_divert_push([SCRIPT])# @configure_input@
 # Gord Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 # Gary V. Vaughan <gary@gnu.org>, 2003
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -31,7 +31,7 @@ $as_unset CDPATH
 m4_include([general.m4sh])
 
 : ${AUTOCONF="autoconf"}
-: ${LIBTOOL="../libtool"}
+: ${LIBTOOL="./libtool"}
 
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
 Xsed="$SED -e 1s/^X//"
@@ -178,7 +178,7 @@ func_configure ()
     $opt_debug
     my_args=${1+"$@"}
     my_dir=`pwd | $SED "$basename"`
-    my_testdir="$srcdir/$my_dir"
+    my_testdir="$srcdir/tests/$my_dir"
 
     test -n "$my_args" && my_args=" $my_args"
     my_args="--srcdir="\""$my_testdir"\"" --prefix="\""$prefix"\""$my_args"
@@ -322,7 +322,7 @@ func_exec ()
 # Shared global variables for test scripts
 prefix="./_inst"
 srcdir=`cd $srcdir && pwd`
-scripts="$srcdir/../config/ltmain.sh ../libtoolize"
+scripts="$srcdir/config/ltmain.sh ./libtoolize"
 
 func_msg "Running $progname"
 
index 3fadc6bf88ca633e1f2187a5f1cf5f7c6e29a2ce..e619d15b585e8bf0b31dc540d3bcb7e6023a5c93 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_make_distclean
 func_configure
 func_check_static_shared "yes" "yes"
index 9987e8c5e8f062eec81e57d08e8ed409709b72e7..a129b60fcf494454a8ca5e3b454fb6feec34c4b1 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "demo-conf" "demo/libhello.la"
+func_require "demo-conf" "tests/demo/libhello.la"
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 echo "linking a shared library against a static library"
 func_make "deplibs-check"
 func_exec_init "uninstalled"
index 380864206c363b41d3e2563cfe87f85d3d9a79ac..67497ed4960303333fe9954c0b0ef7c677972b54 100755 (executable)
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-exec.test - check that programs in the ../demo subdirectory are viable
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "demo-make" "demo/hell$EXEEXT"
+func_require "demo-make" "tests/demo/hell$EXEEXT"
 
 func_rmprefixdir
 func_exec_init "uninstalled"
-func_exec "demo/hell_static" 'Welcome to GNU Hell'
-func_exec "demo/hell" 'Welcome to GNU Hell'
-func_exec "demo/helldl" '(Welcome to .*GNU Hell|unsupported)'
+func_exec "tests/demo/hell_static" 'Welcome to GNU Hell'
+func_exec "tests/demo/hell" 'Welcome to GNU Hell'
+func_exec "tests/demo/helldl" '(Welcome to .*GNU Hell|unsupported)'
 
 exit $exec_status
index 97e9c9877ea3c289dce22280cc99d9855279355e..2f22a83f71e894179e55ff6425760d397b09ec80 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_require "demo-inst" "$prefix/lib/libhello.la"
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 
 # Check to make sure we have a dynamic library.
 func_get_config "library_names" "cat ./libhello.la"
index 747e1be5ea99e74147e1f7f6ef6594e996d2a701..1440d0f7664b9a7a3b9be61271f856ca7804d699 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "demo-make" "demo/hell$EXEEXT"
+func_require "demo-make" "tests/demo/hell$EXEEXT"
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_make "install"
 func_exec_init "installed"
 func_exec "$prefix/bin/hell_static" 'Welcome to GNU Hell'
index e9f0eff037ce5f0698a1fc3a14fd08665e4c31eb..3e27df395ac57208555dfb1ad8cdfd97f249e878 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "demo-conf" "demo/Makefile"
+func_require "demo-conf" "tests/demo/Makefile"
 
 func_rmprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_make
 
 exit 0
index b8e6232cc2f8cc70fab4b984d11c90809603f724..d44f430a021fd4c892427adb1237f88804f5bc9f 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_make_distclean
 func_configure "--enable-fast-install=no"
 
index b809d0e8c24275581eab32d45f8fd7e2f482aa01..a10bc0ad00701754e10c8f465bad9a8392e8a5d6 100755 (executable)
@@ -22,7 +22,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_restore_files ()
 {
@@ -42,7 +42,7 @@ func_save_files ()
 func_require "demo-inst" "$prefix/lib/libhello.la"
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_save_files
 
 func_msg "removing \`libhello.la' and \`hell' from demo"
index 63b4bf79dfdb58194f0b33e76f8efb7578683a0c..a9cc26cf04be67653f72f543c98389cd848a8f80 100755 (executable)
@@ -21,7 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 case "$host" in
 hppa*|x86_64*|s390*)
@@ -33,7 +33,7 @@ hppa*|x86_64*|s390*)
 esac
 
 func_rmprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_make_distclean
 func_configure "--with-pic=no"
 
index 57ad33f70420be0f843db70b39db8d2cd7584792..314385cef044fd1c87da97871029f1b7f0c6e41b 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_rmprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_make_distclean
 func_configure "--with-pic=yes"
 
index 36ecd7233f51abde33da4e37919d520837d5bb59..a3048069244b791092602309cd62e83a0d1e49b8 100755 (executable)
@@ -21,7 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_restore_files ()
 {
@@ -38,10 +38,10 @@ func_save_files ()
     trap "func_restore_files" 0 1 2 13 15
 }
 
-func_require "demo-inst" "$prefix/lib/libhello.la"  "demo/libhello.la"
+func_require "demo-inst" "$prefix/lib/libhello.la"  "tests/demo/libhello.la"
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 
 # Check to make sure we have a dynamic library.
 func_get_config "library_names" "cat libhello.la"
index 58e0f7ec96edb5ba7bdec8cf0da41643b91eeb22..9b59c266c56fd8ccef6debdd6c1744a954d52304 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_make_distclean
 func_configure "--disable-static"
 func_check_static_shared "no" "yes"
index dc8659a8667579af4a86dae2e07358f6c2a944c0..aff158038106a67455e670cda2b1b1523dbd6be7 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_make_distclean
 func_configure "--disable-shared"
 func_check_static_shared "yes" "no"
index 61ee0e0680bca6d79c60dfb5728982ea4accb47e..fe1307aa22fe7254e3dd461c3b2702b8a522aef4 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "demo-inst" "$prefix/bin/hell$EXEEXT" "demo/Makefile"
+func_require "demo-inst" "$prefix/bin/hell$EXEEXT" "tests/demo/Makefile"
 
 func_mkprefixdir
-func_cd "demo"
+func_cd "tests/demo"
 func_make_uninstall
 
 exit 0
index 400dbc683f5c57281c867d25226258fcb606ecd3..2e8f7692a6d15acddf7c6f07294551922a00b256 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "depdemo"
+func_cd "tests/depdemo"
 func_make_distclean
 func_configure
 func_check_static_shared "yes" "yes"
index d5992502149fb9c7c073e949fbdef4313690deac..12f17625bc5ba5bb035fcedc616c8d9f472fbc3f 100755 (executable)
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depdemo-exec.test - check that programs in the depdemo subdirectory are viable
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "depdemo-make" "depdemo/depdemo$EXEEXT"
+func_require "depdemo-make" "tests/depdemo/depdemo$EXEEXT"
 
 func_rmprefixdir
 func_exec_init "uninstalled"
-func_exec "depdemo/depdemo_static"
-func_exec "depdemo/depdemo"
+func_exec "tests/depdemo/depdemo_static"
+func_exec "tests/depdemo/depdemo"
 
 exit $exec_status
index c0d7326222417848ddec8679a2ca2948f311602a..e19e1fc8af0c18950d7aa48a5f8258b443895413 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "depdemo-make" "depdemo/depdemo$EXEEXT"
+func_require "depdemo-make" "tests/depdemo/depdemo$EXEEXT"
 
 func_mkprefixdir
-func_cd "depdemo"
+func_cd "tests/depdemo"
 func_make "install"
 func_exec_init "installed"
 func_exec "$prefix/bin/depdemo_static"
index 11f7dee8994aeb281639decdadcb3f168ce763d8..649789a3e5f163b069c9ebf35a2e2b72cf2b25d5 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "depdemo-conf" "depdemo/Makefile"
+func_require "depdemo-conf" "tests/depdemo/Makefile"
 
 func_rmprefixdir
-func_cd "depdemo"
+func_cd "tests/depdemo"
 func_make
 
 exit 0
index 5bdd260eafa428e4d7e9e25b8a8f516924c36b37..bec0e8c731c46bb82cbca8d0a45f2370539c25ab 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "depdemo"
+func_cd "tests/depdemo"
 func_make_distclean
 func_configure "--enable-fast-install=no"
 
index 3deb13041aaa4ccc67003a8f7c1837d429d32231..98ae4feac9c511f0b8576d7072964c6c0f12f49b 100755 (executable)
@@ -21,7 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_restore_files ()
 {
@@ -48,10 +48,10 @@ func_save_files ()
     trap "func_restore_files" 0 1 2 13 15
 }
 
-func_require "depdemo-inst" "$prefix/lib/libl3.la"  "depdemo/l3/libl3.la"
+func_require "depdemo-inst" "$prefix/lib/libl3.la"  "tests/depdemo/l3/libl3.la"
 
 func_mkprefixdir
-func_cd "depdemo"
+func_cd "tests/depdemo"
 
 # Check to make sure we have a dynamic library.
 func_get_config "library_names" "cat l3/libl3.la"
index e643d85e80f9cc9c4234eaaf5fcb8a3f55a94fab..846d7fb6a1d2c5189af8f0052c3d3792c8a66818 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "depdemo"
+func_cd "tests/depdemo"
 func_make_distclean
 func_configure "--disable-static"
 func_check_static_shared "no" "yes"
index 9c36342b46eacce994386f17dbb611f5fc015352..f98395459cdf71cbce9dc02b8a46b9189134dc61 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "depdemo"
+func_cd "tests/depdemo"
 func_make_distclean
 func_configure "--disable-shared"
 func_check_static_shared "yes" "no"
index 0c552dc584995ac090b2bde4e51849573eb0656e..5490ac3e0767a7a07f412c3af4eeeb6056e52eef 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "depdemo-inst" "$prefix/bin/depdemo$EXEEXT" "depdemo/Makefile"
+func_require "depdemo-inst" "$prefix/bin/depdemo$EXEEXT" "tests/depdemo/Makefile"
 
 func_mkprefixdir
-func_cd "depdemo"
+func_cd "tests/depdemo"
 func_make_uninstall
 
 exit 0
index c56ae6d36121b9729082bfe1aaebffc7d7ab42dc..4a2d46a6b058029b7e5505a40c128e837a0ec9ef 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "f77demo"
+func_cd "tests/f77demo"
 func_make_distclean
 func_configure
 func_check_static_shared "yes" "yes"
index d560c1dcce650b35a284b0e05c1b9dd4d4c09091..f4952d196eab191ae8a95dd4a797acbee09090cb 100755 (executable)
@@ -1,7 +1,7 @@
 #! /bin/sh
 # f77demo-exec.test - check that programs in the f77demo subdirectory are viable
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "f77demo-make" "f77demo/fprogram$EXEEXT" "f77demo/cprogram$EXEEXT"
+func_require "f77demo-make" "tests/f77demo/fprogram$EXEEXT" "tests/f77demo/cprogram$EXEEXT"
 
 func_rmprefixdir
 func_exec_init "uninstalled"
-func_exec "f77demo/fprogram"
-func_exec "f77demo/cprogram"
+func_exec "tests/f77demo/fprogram"
+func_exec "tests/f77demo/cprogram"
 
 exit $exec_status
index 24e7b16890fe56514cfb621320e39a92770f57b9..ca5574f77481f106d35c0d47701477aa40cf5eac 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "f77demo-conf" "f77demo/Makefile"
+func_require "f77demo-conf" "tests/f77demo/Makefile"
 
 func_rmprefixdir
-func_cd "f77demo"
+func_cd "tests/f77demo"
 # May fail make on some platforms, simply "skip" in that case
 #func_make
 eval $MAKE || func_skip "The improved fortran tests catch a known failure mode"
index cdf2485022edf3ec381014314fef39fdcd311a6f..7a20929e8bceb36adcb5554c373010ee448508f9 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "f77demo"
+func_cd "tests/f77demo"
 func_make_distclean
 func_configure "--disable-static"
 func_check_static_shared "no" "yes"
index 9b7ef332ba2e845a4d613971111ecf59b9236e43..636e6da1383d18baa0d3c56dd947bb517789daa5 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "f77demo"
+func_cd "tests/f77demo"
 func_make_distclean
 func_configure "--disable-shared"
 func_check_static_shared "yes" "no"
index 9595907f3f6999562986a57e0a0068b0f5881f64..22534ce0d6bb61613ceed1491f3cb38e001c14bb 100755 (executable)
@@ -21,7 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 rm -f hell.lo
 cat > hell.lo <<EOF
index e943ecf30802352e93d84f943e3b00d9e526fd3a..af6dea77627aa68986574aaa22c0bb58cec89723 100755 (executable)
@@ -21,7 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 # Try a sample link command.
 linkresult=`$LIBTOOL -n --mode=link $CC -o gettext ../lib/libnlsut.a`
index ab2e2bf5ce9c827103954761d1d42fc90aa86834..f5f9df5d9225f9a8c4372e05bddcc4a01426e5eb 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "mdemo"
+func_cd "tests/mdemo"
 func_make_distclean
 func_configure
 func_check_static_shared "yes" "yes"
index d8e8b166802b8594a5ea4772594bf55a887681a6..5d21f58c362049c147f9caf56db435a6a247e87f 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "mdemo-conf" "mdemo/Makefile"
+func_require "mdemo-conf" "tests/mdemo/Makefile"
 
 func_mkprefixdir
-func_cd "mdemo"
+func_cd "tests/mdemo"
 func_make "clean"
 
 # create `before' and `after' in a directory deep within objdir,
index 110ae1a2671cf44d6a6af375ffd3fbf9a8c19476..18ac9cdc253bee0c2cd5e1a8176e764c39ac4669 100755 (executable)
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo-exec.test - check that programs in the mdemo subdirectory are viable
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "mdemo-make" "mdemo/mdemo$EXEEXT"
+func_require "mdemo-make" "tests/mdemo/mdemo$EXEEXT"
 
 func_rmprefixdir
 func_exec_init "uninstalled"
-func_exec "mdemo/mdemo_static mdemo/foo1.la mdemo/libfoo2.la"
-func_exec "mdemo/mdemo mdemo/foo1.la mdemo/libfoo2.la"
+func_exec "tests/mdemo/mdemo_static tests/mdemo/foo1.la tests/mdemo/libfoo2.la"
+func_exec "tests/mdemo/mdemo tests/mdemo/foo1.la tests/mdemo/libfoo2.la"
 
 exit $exec_status
index ba20225477d2cb064ac61a9eca1fb93999b5d81b..a0645fb9f72bdb9a54a98b21f12aa26200d4fb23 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "mdemo-make" "mdemo/mdemo$EXEEXT"
+func_require "mdemo-make" "tests/mdemo/mdemo$EXEEXT"
 
 func_mkprefixdir
-func_cd "mdemo"
+func_cd "tests/mdemo"
 func_make "install"
 func_exec_init "installed"
 func_exec "$prefix/bin/mdemo_static $prefix/lib/foo1.la $prefix/lib/libfoo2.la"
index e97b97a4b32dbd534e784092f26594dcbd0a3e32..5c2eda0b12437ecbe75e2ac53c45eefdb6fb6c4f 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "mdemo-conf" "mdemo/Makefile"
+func_require "mdemo-conf" "tests/mdemo/Makefile"
 
 func_rmprefixdir
-func_cd "mdemo"
+func_cd "tests/mdemo"
 func_make
 
 exit 0
index 4f68e072718f2d138fd8ae25cc6a779c45d31226..2aec5a89d002a6691cd70995a2b48bf812099777 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "mdemo"
+func_cd "tests/mdemo"
 func_make_distclean
 func_configure "--disable-static"
 func_check_static_shared "no" "yes"
index baf4572c29fc05aa0f286442cff1e7f2dc454f5d..10f7f0fa66a6283f8e032b016af89f2af76b05ac 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "mdemo"
+func_cd "tests/mdemo"
 func_make_distclean
 func_configure "--disable-shared"
 func_check_static_shared "yes" "no"
index be2ff1895caea02d3c471331137d64a3e35349ec..406ed8d792ae99ebaff70977cd9835757f266d39 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "mdemo-inst" "$prefix/bin/mdemo$EXEEXT" "mdemo/Makefile"
+func_require "mdemo-inst" "$prefix/bin/mdemo$EXEEXT" "tests/mdemo/Makefile"
 
 func_mkprefixdir
-func_cd "mdemo"
+func_cd "tests/mdemo"
 func_make_uninstall
 
 exit 0
index 73aa28d82952a3b26f6ea8d6353b0224dd346155..f291825f206206dcf9973eefcc7791ced57d1e62 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "mdemo2"
+func_cd "tests/mdemo2"
 func_make_distclean
 func_configure
 func_check_static_shared "yes" "yes"
index 85747798009a2b714c6d5e6b3e0afebdccf44875..74d20eb8aac5896472eb01bb884a492a8ec42403 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "mdemo2-make" "mdemo2/mdemo2$EXEEXT"
+func_require "mdemo2-make" "tests/mdemo2/mdemo2$EXEEXT"
 
 func_rmprefixdir
 func_exec_init "uninstalled"
-func_exec "mdemo2/mdemo2_static mdemo/foo1.la mdemo/libfoo2.la"
-func_exec "mdemo2/mdemo2 mdemo/foo1.la mdemo/libfoo2.la"
+func_exec "tests/mdemo2/mdemo2_static tests/mdemo/foo1.la tests/mdemo/libfoo2.la"
+func_exec "tests/mdemo2/mdemo2 tests/mdemo/foo1.la tests/mdemo/libfoo2.la"
 
 exit $exec_status
index 81bd673d7bfed67187591bcf880d3bc7c5068e58..ade9d9a0c411c373a3e7ecc2aa7b19214dfe1e33 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "mdemo2-conf" "mdemo2/Makefile"
-func_require "mdemo-make" "mdemo/libmlib.la"
+func_require "mdemo2-conf" "tests/mdemo2/Makefile"
+func_require "mdemo-make" "tests/mdemo/libmlib.la"
 
 func_rmprefixdir
-func_cd "mdemo2"
+func_cd "tests/mdemo2"
 func_make
 
 exit 0
index 98ed7d43be41641e076d27a7f2b4c8760313b707..3962f55d3b2510280d5544f82e0ed7d2d040fbec 100755 (executable)
@@ -21,7 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 status=$EXIT_SUCCESS
 if $LIBTOOL --help 2>&1 | grep '^Usage:' >/dev/null; then :
index 9b471a885cb45704c3c50bb12fb7000962697c68..662ec29ecde24818364fd463de7b17db0d8f9e4d 100755 (executable)
@@ -22,7 +22,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 # Try a sample link command.
 linkresult=`$LIBTOOL -n --mode=link $CC -objectlist nonexistant 2>&1`
index 5089e4d11970e9b26cade2f58589e290639a0efe..56355ef512f9ef1cec0c7833b18eeee943882af0 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "pdemo"
+func_cd "tests/pdemo"
 func_make_distclean
 func_configure
 func_check_static_shared "yes" "yes"
index d7c8f5814e437869bb9ec381cee86eca8570bd3b..f641e77b08b0feaf9acced0534ea094a9ca4f10e 100755 (executable)
@@ -1,7 +1,7 @@
 #! /bin/sh
 # pdemo-exec.test - check that programs in the pdemo subdirectory are viable
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "pdemo-make" "pdemo/hell$EXEEXT"
+func_require "pdemo-make" "tests/pdemo/hell$EXEEXT"
 
 func_rmprefixdir
 func_exec_init "uninstalled"
-func_exec "pdemo/hell_static" 'Welcome to GNU Hell'
-func_exec "pdemo/hell" 'Welcome to GNU Hell'
-func_exec "pdemo/helldl" '(Welcome to .*GNU Hell|unsupported)'
+func_exec "tests/pdemo/hell_static" 'Welcome to GNU Hell'
+func_exec "tests/pdemo/hell" 'Welcome to GNU Hell'
+func_exec "tests/pdemo/helldl" '(Welcome to .*GNU Hell|unsupported)'
 
 exit $exec_status
index b54acf5637676862539b41fcc64c6e98fd865544..fa97204e0220a1d3807af47f3986154ad4186383 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "pdemo-make" "pdemo/hell$EXEEXT"
+func_require "pdemo-make" "tests/pdemo/hell$EXEEXT"
 
 func_mkprefixdir
-func_cd "pdemo"
+func_cd "tests/pdemo"
 func_make "install"
 func_exec_init "installed"
 func_exec "$prefix/bin/hell_static" 'Welcome to GNU Hell'
index caa826af621407f325894a620f4f5d1f5e6b646e..5ff1f2554cd8d888429ed3251565fc1c26e73bc3 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "pdemo-conf" "pdemo/Makefile"
+func_require "pdemo-conf" "tests/pdemo/Makefile"
 
 func_rmprefixdir
-func_cd "pdemo"
+func_cd "tests/pdemo"
 func_make
 
 exit 0
index 7663eb0c2b0bc7cf14d98fe869ec4fc2d8a9b9e8..fb40ea9fbd59ce53259c4d764bc4f763c2feb210 100755 (executable)
@@ -1,7 +1,7 @@
 #! /bin/sh
 # quote.test - make sure that shell metacharacters do not blow up libtool
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,7 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 # Do the torture test.
 status=$EXIT_SUCCESS
@@ -30,13 +30,13 @@ case $1 in
   --no-reexec)
     ;;
   *)
-    func_get_config "SHELL" "../libtool --config"
+    func_get_config "SHELL" "$LIBTOOL --config"
     exec $SHELL "$0" --no-reexec ${1+"$@"}
     ;;
 esac
 
-func_get_config "ECHO" "../libtool --config"
-func_get_config "wl" "../libtool --config"
+func_get_config "ECHO" "$LIBTOOL --config"
+func_get_config "wl" "$LIBTOOL --config"
 
 for mode in compile link install; do
   $ECHO "== $mode mode"
index f8c9b7de6a47a10a9fdd63345e23923b8e494538..2f457372a5eeed00332d5d9cba6113b58299a2cc 100755 (executable)
@@ -1,7 +1,7 @@
 #! /bin/sh
 # sh.test - check that we haven't forgotten a `test' command
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,7 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 # Check all the "portable" shell scripts.
 status=$EXIT_SUCCESS
@@ -105,7 +105,7 @@ func_foo ()
   fi
 done
 
-for s in "$srcdir/../m4/libtool.m4"
+for s in "$srcdir/m4/libtool.m4"
 do
   if $SED -n '/case \$cc_basename in/,/esac/ {
              /^[       ]*[a-zA-Z][a-zA-Z0-9+]*[^*][    ]*)/p
index 0f91fef9fe94cc7f2a5bad799581952f7be17b41..1768086ec748051eabf3614cf57bfc290104a976 100755 (executable)
@@ -26,7 +26,7 @@
 extensions="C F S ada adb ads asm c c++ cc cpp cxx f f90 for m s"
 bad_names="foo."
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 status=$EXIT_SUCCESS
 for ext in $extensions; do
index 08ab2b8d60ce9605e134a3874d6b568f7e6a04aa..7bb359bff0c78e5638da55521eb0bbf5b8788645 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "tagdemo"
+func_cd "tests/tagdemo"
 func_make_distclean
 func_configure
 func_check_static_shared "yes" "yes"
index 21d107f83690251bbb2023e4bc5b582d9096c597..f7d61717580a6b809fb5201b0f08be3f0979fc24 100755 (executable)
@@ -1,7 +1,7 @@
 #! /bin/sh
 # tagdemo-exec.test - check that programs in the tagdemo subdirectory are viable
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "tagdemo-make" "tagdemo/tagdemo$EXEEXT"
+func_require "tagdemo-make" "tests/tagdemo/tagdemo$EXEEXT"
 
 func_rmprefixdir
 func_exec_init "uninstalled"
-func_exec "tagdemo/tagdemo"
+func_exec "tests/tagdemo/tagdemo"
 
 exit $exec_status
index 19d35b64642014a1ca37f22814cc76d5b95ee1f1..eb16f0eb2ddbe660e3d854f49b6e028c5b76c212 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-func_require "tagdemo-conf" "tagdemo/Makefile"
+func_require "tagdemo-conf" "tests/tagdemo/Makefile"
 
 func_rmprefixdir
-func_cd "tagdemo"
+func_cd "tests/tagdemo"
 func_make
 
 exit 0
index 41eedb2404bd6cfb1bb021af7a1ddb420ff141fe..599af246c715c4c977a63bfe6dd2c164fb9cca9d 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "tagdemo"
+func_cd "tests/tagdemo"
 func_make_distclean
 func_configure "--disable-static"
 func_check_static_shared "no" "yes"
index a1aa2231a387325bc2346232992ef414e522e54c..cb1d169da25d50951c12656dbc697b3da009e489 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 func_mkprefixdir
-func_cd "tagdemo"
+func_cd "tests/tagdemo"
 func_make_distclean
 func_configure "--disable-shared"
 func_check_static_shared "yes" "no"
index e9bea874642fbe3596fa189529c89471765ef2a1..f1cac2734edd42cbebed15c07763547a68492b6a 100755 (executable)
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
 
 func_mkprefixdir
-func_cd "tagdemo"
+func_cd "tests/tagdemo"
 func_make_distclean
 func_configure "--disable-static"
 
index 7c4195f821537c23952b496843226bcd2113fdbd..738bfa1c01f6ca6f003d0f73cb6b38e2ea2981aa 100755 (executable)
@@ -1,7 +1,7 @@
 #! /bin/sh
 # tagtrace.test - check the LT_SUPPORTED_TAGS interface
 
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,9 +21,9 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-. ./defs || exit 1
+. tests/defs || exit 1
 
-: ${fnord=$srcdir/../fnord$$}
+: ${fnord=$srcdir/fnord$$}
 
 "$AUTOCONF" --version > /dev/null 2>&1 || func_skip "This test requires GNU Autoconf"
 if touch $fnord; then
@@ -36,7 +36,7 @@ fi
 set -e
 
 # Retrieve the list of tags supported by our main libtool script.
-traced_tags=`cd "$srcdir/.." && "$AUTOCONF" --trace 'LT_SUPPORTED_TAG:$1'`
+traced_tags=`cd "$srcdir" && "$AUTOCONF" --trace 'LT_SUPPORTED_TAG:$1'`
 
 test -n "$traced_tags"