diff options
author | Ben Elliston <bje@gnu.org> | 2003-08-17 23:18:17 +0000 |
---|---|---|
committer | Ben Elliston <bje@gnu.org> | 2003-08-17 23:18:17 +0000 |
commit | 8c0501cab615807ad06177c7b5360af4bc1319e6 (patch) | |
tree | f8f4883bedd5b81456d68c156feaab850d309006 | |
parent | 6e65bf03d9033520d6ec4a37378c6af8daf12a05 (diff) |
* Makefile.am: Tidy comments and unused command lines.indent-tcl-mode-before
* Makefile.in: Regenerate.
* testsuite/libdejagnu/Makefile.in: Likewise.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | Makefile.am | 21 | ||||
-rw-r--r-- | Makefile.in | 19 | ||||
-rw-r--r-- | testsuite/libdejagnu/Makefile.in | 2 |
4 files changed, 23 insertions, 23 deletions
@@ -1,5 +1,9 @@ 2003-08-18 Ben Elliston <bje@wasabisystems.com> + * Makefile.am: Tidy comments and unused command lines. + * Makefile.in: Regenerate. + * testsuite/libdejagnu/Makefile.in: Likewise. + * contrib/bluegnu2.0.3: Remove unsupported subtree. 2003-08-18 Ben Elliston <bje@wasabisystems.com> diff --git a/Makefile.am b/Makefile.am index a1fe31e..5baca60 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,8 +11,8 @@ bin_SCRIPTS = runtest # Install the main DejaGnu expect file in the datadir pkgdata_SCRIPTS = runtest.exp -# Install config.guess too, so we can use it to figure out -# what type of machine we're running on. +# Install config.guess too, so we can use it to figure out what type +# of machine we're running on. libexecdir = $(pkgdatadir)/libexec libexec_SCRIPTS = config.guess @@ -31,11 +31,10 @@ CLEANFILES = x.log x.sum site.bak setval.tmp check-DEJAGNU: cd testsuite ; $(MAKE) check cd example ; $(MAKE) check -# @echo "Do nothing here, cause we don't want to run the tests twice" -# Since we don't use SUBDIRS, we have to manually clean the sub directories. -# We don't use SUBDIRS, so the excample or test cases don't get built -# by default for a "make all". +# Since we don't use SUBDIRS, we have to manually clean the +# subdirectories. We don't use SUBDIRS, so the example or test cases +# don't get built by default for a "make all". clean-local: cd doc ; $(MAKE) clean cd testsuite ; $(MAKE) clean @@ -78,12 +77,12 @@ snapshot: rpmspec: $(srcdir)/packaging/rpm/dejagnu.spec cp -f $(srcdir)/packaging/rpm/dejagnu.spec /usr/src/redhat/SPECS/ -# this builds an RPM package +# Build an RPM package rpm: tarball rpmspec cp -f ../$(distdir).tar.gz /usr/src/redhat/SOURCES/ rpm -ba /usr/src/redhat/SPECS/dejagnu.spec -# this builds a Debian Linux style deb package. +# Build a Debian deb package deb: overview.html overview.ps overview.pdf -rm -fr dejagnu-${VERSION} cp -fpr $(srcdir) dejagnu-${VERSION} @@ -99,7 +98,7 @@ deb: overview.html overview.ps overview.pdf -cp -fr doc/overview.rtf dejagnu-${VERSION}/doc/; (cd dejagnu-${VERSION}; dpkg-buildpackage) -# this builds a Solaris style pkg package. +# Build a Solaris package solpkg: $(srcdir)/packaging/pkg/prototype if test ! -d $(PKGDIR)/dejagnu; then \ rm -fr dejagnu-${VERSION}; \ @@ -117,7 +116,7 @@ solpkg: $(srcdir)/packaging/pkg/prototype gzip -9fv $$here/dejagnu-${VERSION}.SPARC.2.8.pkg.tar rm -fr /tmp/prototype /tmp/pkginfo /tmp/DejaGnu -# this builds a HPUX style depot file +# Build a HP depot package hpdepot: # $(srcdir)/packaging/depot/dejagnu.psf if test ! -d $(PKGDIR)/dejagnu; then \ rm -fr dejagnu-${VERSION}; \ @@ -148,7 +147,6 @@ dist-hook: rpmspec overview.html overview.ps overview.pdf -cp -fr doc/overview.ps $(distdir)/doc/ -cp -fr doc/overview.pdf $(distdir)/doc/ - # Below, host-independent data files that need to get installed. # We do it this way so we can use globbing. @@ -158,7 +156,6 @@ lib_files = $(srcdir)/*.c $(srcdir)/lib/*.exp baseboards_dest = $(DESTDIR)$(pkgdatadir)/baseboards baseboards_files = $(srcdir)/baseboards/README $(srcdir)/baseboards/*.exp - include_dest = $(DESTDIR)$(includedir) config_dest = $(DESTDIR)$(pkgdatadir)/config config_files = $(srcdir)/config/README $(srcdir)/config/*.exp diff --git a/Makefile.in b/Makefile.in index aa727c7..8b01395 100644 --- a/Makefile.in +++ b/Makefile.in @@ -106,8 +106,8 @@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ -# Install config.guess too, so we can use it to figure out -# what type of machine we're running on. +# Install config.guess too, so we can use it to figure out what type +# of machine we're running on. libexecdir = $(pkgdatadir)/libexec localstatedir = @localstatedir@ mandir = @mandir@ @@ -624,11 +624,10 @@ uninstall-info: uninstall-info-recursive check-DEJAGNU: cd testsuite ; $(MAKE) check cd example ; $(MAKE) check -# @echo "Do nothing here, cause we don't want to run the tests twice" -# Since we don't use SUBDIRS, we have to manually clean the sub directories. -# We don't use SUBDIRS, so the excample or test cases don't get built -# by default for a "make all". +# Since we don't use SUBDIRS, we have to manually clean the +# subdirectories. We don't use SUBDIRS, so the example or test cases +# don't get built by default for a "make all". clean-local: cd doc ; $(MAKE) clean cd testsuite ; $(MAKE) clean @@ -671,12 +670,12 @@ snapshot: rpmspec: $(srcdir)/packaging/rpm/dejagnu.spec cp -f $(srcdir)/packaging/rpm/dejagnu.spec /usr/src/redhat/SPECS/ -# this builds an RPM package +# Build an RPM package rpm: tarball rpmspec cp -f ../$(distdir).tar.gz /usr/src/redhat/SOURCES/ rpm -ba /usr/src/redhat/SPECS/dejagnu.spec -# this builds a Debian Linux style deb package. +# Build a Debian deb package deb: overview.html overview.ps overview.pdf -rm -fr dejagnu-${VERSION} cp -fpr $(srcdir) dejagnu-${VERSION} @@ -692,7 +691,7 @@ deb: overview.html overview.ps overview.pdf -cp -fr doc/overview.rtf dejagnu-${VERSION}/doc/; (cd dejagnu-${VERSION}; dpkg-buildpackage) -# this builds a Solaris style pkg package. +# Build a Solaris package solpkg: $(srcdir)/packaging/pkg/prototype if test ! -d $(PKGDIR)/dejagnu; then \ rm -fr dejagnu-${VERSION}; \ @@ -710,7 +709,7 @@ solpkg: $(srcdir)/packaging/pkg/prototype gzip -9fv $$here/dejagnu-${VERSION}.SPARC.2.8.pkg.tar rm -fr /tmp/prototype /tmp/pkginfo /tmp/DejaGnu -# this builds a HPUX style depot file +# Build a HP depot package hpdepot: # $(srcdir)/packaging/depot/dejagnu.psf if test ! -d $(PKGDIR)/dejagnu; then \ rm -fr dejagnu-${VERSION}; \ diff --git a/testsuite/libdejagnu/Makefile.in b/testsuite/libdejagnu/Makefile.in index 6e09185..bedda65 100644 --- a/testsuite/libdejagnu/Makefile.in +++ b/testsuite/libdejagnu/Makefile.in @@ -163,7 +163,7 @@ Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.s clean-noinstPROGRAMS: -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) -unit$(EXEEXT): $(unit_OBJECTS) $(unit_DEPENDENCIES) +unit$(EXEEXT): $(unit_OBJECTS) $(unit_DEPENDENCIES) @rm -f unit$(EXEEXT) $(CXXLINK) $(unit_LDFLAGS) $(unit_OBJECTS) $(unit_LDADD) $(LIBS) |