(as.dvi target) update for new source file structure supporting

                texinfo conditionals
(as.ms, as.mm, as.me targets) update for new structure, and add note that
                these targets probably broken until texi2roff supports
                texinfo conditionals
(clean-dvi target) new; clean dvi files and side effects
(clean-info target) clean out only info files
(clean target)  run clean-dvi, clean-info

diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in
index a669e7643077318029e7b4cd63d0e7339d769ff1..64414499f9854a340c879de34db93a35d49b23b9 100644 (file)
--- a/gas/doc/Makefile.in
+++ b/gas/doc/Makefile.in
@@ -71,7 +71,6 @@ TEXIDIR = $(srcdir)/../../texinfo
 ##
 
 all:
-clean:
 install:
        -parent=`echo $(man1dir)|sed -e 's@/[^/]*$$@@'`; \
        if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi
@@ -99,42 +98,47 @@ install-info: as.info
 
 dvi: as.dvi
 
-as.dvi:        as-${CONFIG}.texinfo
-       $(TEXI2DVI) as-${CONFIG}.texinfo
-       mv as-${CONFIG}.dvi as.dvi
+as.dvi:        as.texinfo asdoc-config.texi
+       $(TEXI2DVI) as.texinfo
 
 # ROFF doc targets as.ms, as.mm, as.me
 # (we don't use a variable because we don't trust all makes to handle
 # a var in the target name right).
 # roff output (-ms)
-as.ms: as-${CONFIG}.texinfo
+# THESE ARE PROBABLY BROKEN until texi2roff extended for Texinfo conditionals
+as.ms: as.texinfo asdoc-config.texi
        sed -e '/\\input texinfo/d' \
                -e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \
                -e 's/{.*,,/{/' \
-               as-${CONFIG}.texinfo | \
+               as.texinfo | \
        texi2roff -ms >as.ms 
 
 # roff output (-mm)
-as.mm: as-${CONFIG}.texinfo
+as.mm: as.texinfo asdoc-config.texi
        sed -e '/\\input texinfo/d' \
                -e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \
                -e 's/{.*,,/{/' \
                -e '/@noindent/d' \
-               as-${CONFIG}.texinfo | \
+               as.texinfo | \
        texi2roff -mm | \
        sed -e 's/---/\\(em/g' \
        >as.mm 
 
 # roff output (-me)
-as.me: as-${CONFIG}.texinfo
+as.me: as.texinfo asdoc-config.texi
        sed -e '/\\input texinfo/d' \
                -e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \
                -e 's/{.*,,/{/' \
-               as-${CONFIG}.texinfo | \
+               as.texinfo | \
        texi2roff -me >as.me 
 
+clean: clean-dvi clean-info
+
+clean-dvi:
+       rm -f as.?? as.???
+
 clean-info:
-       rm -f as-${CONFIG}.* as.dvi as.info*
+       rm -f as.info*
 
 force: