2004-01-27 Ben Elliston <bje@wasabisystems.com>
+ * 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 <bje@wasabisystems.com>
+
* Clean.tcl: Run tclsh via /usr/bin/env for portability.
(cleanfiles): Concatenate regular filenames that match .*.
-## Process this file with automake to generate Makefile.in
+# Process this file with automake to generate Makefile.in
AUTOMAKE_OPTIONS = dejagnu
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"
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)
@SET_MAKE@
+# Process this file with automake to generate Makefile.in
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
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"
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)
# 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)
# 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
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
# 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