From: Ben Elliston Date: Tue, 27 Jan 2004 07:30:01 +0000 (+0000) Subject: * Makefile.am (tarball): Depend on book1.html, not overview.html. X-Git-Tag: upstream/1.6.2~484 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=904f989fda69bc716dd80ad8d5e2d239aac05144;p=platform%2Fupstream%2Fdejagnu.git * Makefile.am (tarball): Depend on book1.html, not overview.html. Don't echo needless messages. Portably copy the source tree to dejagnu-${VERSION}. Portably copy documentation files from the source tree to the distribution directory. Don't copy RPM-related files -- leave that to the rpm target. (snapshot): Remove target. (overview.html): Rename target from this .. (book1.htm): .. to this. (rpm): Portably copy tar file to SOURCES directory. (deb): Depend on book1.html, not overview.html. (dist-hook): Depend on book1.html, not overview.html. * Makefile.in: Rebuild. * doc/Makefile.am (TARGETS): Depend on book1.html. (book1.html): Depend on html/book1.html. (overview.dvi): Remove target. * doc/Makefile.in: Rebuild. --- diff --git a/ChangeLog b/ChangeLog index 4cc7dfc..d132f76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,24 @@ 2004-01-27 Ben Elliston + * Makefile.am (tarball): Depend on book1.html, not overview.html. + Don't echo needless messages. Portably copy the source tree to + dejagnu-${VERSION}. Portably copy documentation files from the + source tree to the distribution directory. Don't copy RPM-related + files -- leave that to the rpm target. + (snapshot): Remove target. + (overview.html): Rename target from this .. + (book1.htm): .. to this. + (rpm): Portably copy tar file to SOURCES directory. + (deb): Depend on book1.html, not overview.html. + (dist-hook): Depend on book1.html, not overview.html. + * Makefile.in: Rebuild. + * doc/Makefile.am (TARGETS): Depend on book1.html. + (book1.html): Depend on html/book1.html. + (overview.dvi): Remove target. + * doc/Makefile.in: Rebuild. + +2004-01-27 Ben Elliston + * Clean.tcl: Run tclsh via /usr/bin/env for portability. (cleanfiles): Concatenate regular filenames that match .*. diff --git a/Makefile.am b/Makefile.am index 5baca60..3a4c8a6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -## Process this file with automake to generate Makefile.in +# Process this file with automake to generate Makefile.in AUTOMAKE_OPTIONS = dejagnu @@ -41,49 +41,29 @@ clean-local: cd example ; $(MAKE) clean # Set ourselves up to build an RPM -tarball: overview.html overview.ps overview.pdf +tarball: book1.html overview.ps overview.pdf -rm -fr dejagnu-${VERSION} - cp -fpr $(srcdir) dejagnu-${VERSION} - @echo "clean up stuff we don't want in the source file" + cp -fpPR $(srcdir) dejagnu-${VERSION} src=$(srcdir); \ dir=`(cd $${src}; pwd)`; \ (cd dejagnu-${VERSION} ; $${dir}/Clean.tcl); \ - mkdir -p doc/html; \ - cp -fr doc/html dejagnu-${VERSION}/doc/; \ - cp -fr doc/overview.ps dejagnu-${VERSION}/doc/; \ - cp -fr doc/overview.pdf dejagnu-${VERSION}/doc/; \ - cp -fr doc/overview.rtf dejagnu-${VERSION}/doc/; \ + cp -R $(srcdir)/doc/html dejagnu-${VERSION}/doc/; \ + cp $(srcdir)/doc/overview.ps dejagnu-${VERSION}/doc/; \ + cp $(srcdir)/doc/overview.pdf dejagnu-${VERSION}/doc/; \ + cp $(srcdir)/doc/overview.rtf dejagnu-${VERSION}/doc/; \ tar cvf ../dejagnu-${VERSION}.tar dejagnu-${VERSION}; \ - gzip -9fv ../dejagnu-${VERSION}.tar; \ - cp -f ../dejagnu-${VERSION}.tar.gz /usr/src/redhat/SOURCES/; \ - cp -f $${dir}/packaging/rpm/dejagnu.spec /usr/src/redhat/SPECS/ - -# this builds a date stamped tarball of the current sources -snapshot: - -rm -fr dejagnu-${DATE} - cp -fpr $(srcdir) dejagnu-${DATE} - @echo "clean up stuff we don't want in the source file" - src=$(srcdir); \ - dir=`(cd $${src}; pwd)`; \ - (cd dejagnu-${DATE} ; $${dir}/Clean.tcl); - -mkdir -p doc/html - -cp -fr doc/html dejagnu-${DATE}/doc/ - -cp -fr doc/overview.ps dejagnu-${DATE}/doc/ - -cp -fr doc/overview.pdf dejagnu-${DATE}/doc/ - -cp -fr doc/overview.rtf dejagnu-${DATE}/doc/ - tar cf ../dejagnu-${DATE}.tar dejagnu-${DATE} - gzip -9fv ../dejagnu-${DATE}.tar + gzip -9fv ../dejagnu-${VERSION}.tar rpmspec: $(srcdir)/packaging/rpm/dejagnu.spec cp -f $(srcdir)/packaging/rpm/dejagnu.spec /usr/src/redhat/SPECS/ # Build an RPM package rpm: tarball rpmspec - cp -f ../$(distdir).tar.gz /usr/src/redhat/SOURCES/ + cp -f ../dejagnu-${VERSION}.tar.gz /usr/src/redhat/SOURCES/ rpm -ba /usr/src/redhat/SPECS/dejagnu.spec # Build a Debian deb package -deb: overview.html overview.ps overview.pdf +deb: book1.html overview.ps overview.pdf -rm -fr dejagnu-${VERSION} cp -fpr $(srcdir) dejagnu-${VERSION} @echo "clean up stuff we don't want in the source file" @@ -132,14 +112,14 @@ hpdepot: # $(srcdir)/packaging/depot/dejagnu.psf gzip -9fv $$here/dejagnu-${VERSION}.hpux11.depot; \ rm -fr /tmp/dejagnu -overview.html overview.ps overview.pdf install-doc: +book1.html overview.ps overview.pdf install-doc: cd doc && $(MAKE) $(FLAGS_TO_PASS) $@ # Automake sucks when it comes to building a distribution, so # we just copy the source tree onto of what Automake did, and # then we Clean it. Automake only includes the source files. # We want all the testsuites, data files, and html versions of the doc. -dist-hook: rpmspec overview.html overview.ps overview.pdf +dist-hook: rpmspec book1.html overview.ps overview.pdf -rm -fr $(distdir) cp -fpr $(srcdir) $(distdir) (cd $(distdir) ; $(TCLSH) $(srcdir)/Clean.tcl) diff --git a/Makefile.in b/Makefile.in index 8b01395..0a0ad97 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,6 +14,8 @@ @SET_MAKE@ +# Process this file with automake to generate Makefile.in + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -634,49 +636,29 @@ clean-local: cd example ; $(MAKE) clean # Set ourselves up to build an RPM -tarball: overview.html overview.ps overview.pdf +tarball: book1.html overview.ps overview.pdf -rm -fr dejagnu-${VERSION} - cp -fpr $(srcdir) dejagnu-${VERSION} - @echo "clean up stuff we don't want in the source file" + cp -fpPR $(srcdir) dejagnu-${VERSION} src=$(srcdir); \ dir=`(cd $${src}; pwd)`; \ (cd dejagnu-${VERSION} ; $${dir}/Clean.tcl); \ - mkdir -p doc/html; \ - cp -fr doc/html dejagnu-${VERSION}/doc/; \ - cp -fr doc/overview.ps dejagnu-${VERSION}/doc/; \ - cp -fr doc/overview.pdf dejagnu-${VERSION}/doc/; \ - cp -fr doc/overview.rtf dejagnu-${VERSION}/doc/; \ + cp -R $(srcdir)/doc/html dejagnu-${VERSION}/doc/; \ + cp $(srcdir)/doc/overview.ps dejagnu-${VERSION}/doc/; \ + cp $(srcdir)/doc/overview.pdf dejagnu-${VERSION}/doc/; \ + cp $(srcdir)/doc/overview.rtf dejagnu-${VERSION}/doc/; \ tar cvf ../dejagnu-${VERSION}.tar dejagnu-${VERSION}; \ - gzip -9fv ../dejagnu-${VERSION}.tar; \ - cp -f ../dejagnu-${VERSION}.tar.gz /usr/src/redhat/SOURCES/; \ - cp -f $${dir}/packaging/rpm/dejagnu.spec /usr/src/redhat/SPECS/ - -# this builds a date stamped tarball of the current sources -snapshot: - -rm -fr dejagnu-${DATE} - cp -fpr $(srcdir) dejagnu-${DATE} - @echo "clean up stuff we don't want in the source file" - src=$(srcdir); \ - dir=`(cd $${src}; pwd)`; \ - (cd dejagnu-${DATE} ; $${dir}/Clean.tcl); - -mkdir -p doc/html - -cp -fr doc/html dejagnu-${DATE}/doc/ - -cp -fr doc/overview.ps dejagnu-${DATE}/doc/ - -cp -fr doc/overview.pdf dejagnu-${DATE}/doc/ - -cp -fr doc/overview.rtf dejagnu-${DATE}/doc/ - tar cf ../dejagnu-${DATE}.tar dejagnu-${DATE} - gzip -9fv ../dejagnu-${DATE}.tar + gzip -9fv ../dejagnu-${VERSION}.tar rpmspec: $(srcdir)/packaging/rpm/dejagnu.spec cp -f $(srcdir)/packaging/rpm/dejagnu.spec /usr/src/redhat/SPECS/ # Build an RPM package rpm: tarball rpmspec - cp -f ../$(distdir).tar.gz /usr/src/redhat/SOURCES/ + cp -f ../dejagnu-${VERSION}.tar.gz /usr/src/redhat/SOURCES/ rpm -ba /usr/src/redhat/SPECS/dejagnu.spec # Build a Debian deb package -deb: overview.html overview.ps overview.pdf +deb: book1.html overview.ps overview.pdf -rm -fr dejagnu-${VERSION} cp -fpr $(srcdir) dejagnu-${VERSION} @echo "clean up stuff we don't want in the source file" @@ -725,14 +707,14 @@ hpdepot: # $(srcdir)/packaging/depot/dejagnu.psf gzip -9fv $$here/dejagnu-${VERSION}.hpux11.depot; \ rm -fr /tmp/dejagnu -overview.html overview.ps overview.pdf install-doc: +book1.html overview.ps overview.pdf install-doc: cd doc && $(MAKE) $(FLAGS_TO_PASS) $@ # Automake sucks when it comes to building a distribution, so # we just copy the source tree onto of what Automake did, and # then we Clean it. Automake only includes the source files. # We want all the testsuites, data files, and html versions of the doc. -dist-hook: rpmspec overview.html overview.ps overview.pdf +dist-hook: rpmspec book1.html overview.ps overview.pdf -rm -fr $(distdir) cp -fpr $(srcdir) $(distdir) (cd $(distdir) ; $(TCLSH) $(srcdir)/Clean.tcl) diff --git a/doc/Makefile.am b/doc/Makefile.am index 8dbfded..def9da9 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -5,7 +5,7 @@ man_MANS = runtest.1 # now, don't install the old texinfo document from version 1.3 # info_TEXINFOS = dejagnu.texi DOCBOOK = @DOCBOOK@ -TARGETS = overview.html overview.ps overview.pdf overview.rtf +TARGETS = book1.html overview.ps overview.pdf overview.rtf docs: $(TARGETS) @@ -49,7 +49,9 @@ docs: $(TARGETS) # now for some extra dependencies that the automatic rules will not # catch: -html/book1.html rtf overview.pdf overview.ps overview.dvi overview.rtf overview.html: overview.sgml ref.sgml user.sgml +book1.html: html/book1.html + +html/book1.html rtf overview.pdf overview.ps overview.rtf overview.html: overview.sgml ref.sgml user.sgml html/book1.html: overview.sgml ref.sgml user.sgml diff --git a/doc/Makefile.in b/doc/Makefile.in index 9a895a5..4553700 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -122,7 +122,7 @@ target_alias = @target_alias@ tclsh = @tclsh@ man_MANS = runtest.1 -TARGETS = overview.html overview.ps overview.pdf overview.rtf +TARGETS = book1.html overview.ps overview.pdf overview.rtf subdir = doc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -354,7 +354,9 @@ docs: $(TARGETS) # now for some extra dependencies that the automatic rules will not # catch: -html/book1.html rtf overview.pdf overview.ps overview.dvi overview.rtf overview.html: overview.sgml ref.sgml user.sgml +book1.html: html/book1.html + +html/book1.html rtf overview.pdf overview.ps overview.rtf overview.html: overview.sgml ref.sgml user.sgml html/book1.html: overview.sgml ref.sgml user.sgml