deprecate GASP

3 files changed, 21 insertions, 19 deletions

diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am
index a526dde..cfb8f89 100644
--- a/gas/doc/Makefile.am
+++ b/gas/doc/Makefile.am
@@ -15,7 +15,9 @@ POD2MAN = pod2man --center="GNU Development Tools" \
 
 man_MANS = as.1
 
-info_TEXINFOS = as.texinfo gasp.texi
+# The gasp.texi file is now deprecated, as GASP has been deprecated.
+# It will disappear in a future release.
+info_TEXINFOS = as.texinfo 
 
 asconfig.texi: $(CONFIG).texi
 	rm -f asconfig.texi
@@ -68,7 +70,7 @@ install: install-info
 
 # This one isn't ready for prime time yet.  Not even a little bit.
 
-noinst_TEXINFOS = internals.texi
+noinst_TEXINFOS = internals.texi gasp.texi
 
 DISTCLEANFILES = asconfig.texi
 
diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in
index d87c923..25daeaf 100644
--- a/gas/doc/Makefile.in
+++ b/gas/doc/Makefile.in
@@ -132,7 +132,9 @@ POD2MAN = pod2man --center="GNU Development Tools" \
 
 man_MANS = as.1
 
-info_TEXINFOS = as.texinfo gasp.texi
+# The gasp.texi file is now deprecated, as GASP has been deprecated.
+# It will disappear in a future release.
+info_TEXINFOS = as.texinfo 
 
 CPU_DOCS = \
 	c-a29k.texi \
@@ -169,7 +171,7 @@ CPU_DOCS = \
 
 # This one isn't ready for prime time yet.  Not even a little bit.
 
-noinst_TEXINFOS = internals.texi
+noinst_TEXINFOS = internals.texi gasp.texi
 
 DISTCLEANFILES = asconfig.texi
 
@@ -179,9 +181,9 @@ CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
 TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then echo $(top_srcdir)/../texinfo/util/texi2dvi; else echo texi2dvi; fi`
 TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
-INFO_DEPS = as.info gasp.info
-DVIS = as.dvi gasp.dvi
-TEXINFOS = as.texinfo gasp.texi
+INFO_DEPS = as.info
+DVIS = as.dvi
+TEXINFOS = as.texinfo 
 man1dir = $(mandir)/man1
 MANS = $(man_MANS)
 
@@ -191,7 +193,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -208,10 +210,6 @@ as.info: as.texinfo
 as.dvi: as.texinfo
 
 
-gasp.info: gasp.texi
-gasp.dvi: gasp.texi
-
-
 DVIPS = dvips
 
 .texi.info:
@@ -304,10 +302,7 @@ dist-info: $(INFO_DEPS)
 mostlyclean-aminfo:
 	-rm -f as.aux as.cp as.cps as.dvi as.fn as.fns as.ky as.kys as.ps \
 	  as.log as.pg as.toc as.tp as.tps as.vr as.vrs as.op as.tr \
-	  as.cv as.cn gasp.aux gasp.cp gasp.cps gasp.dvi gasp.fn \
-	  gasp.fns gasp.ky gasp.kys gasp.ps gasp.log gasp.pg gasp.toc \
-	  gasp.tp gasp.tps gasp.vr gasp.vrs gasp.op gasp.tr gasp.cv \
-	  gasp.cn
+	  as.cv as.cn
 
 clean-aminfo:
 
diff --git a/gas/doc/gasp.texi b/gas/doc/gasp.texi
index 9358059..76ca475 100644
--- a/gas/doc/gasp.texi
+++ b/gas/doc/gasp.texi
@@ -3,7 +3,7 @@
 @c
 @c This file documents the assembly preprocessor "GASP"
 @c
-@c Copyright 1994, 1995, 2000 Free Software Foundation, Inc.
+@c Copyright 1994, 1995, 2000, 2002 Free Software Foundation, Inc.
 @c
 @c    Permission is granted to copy, distribute and/or modify this document
 @c    under the terms of the GNU Free Documentation License, Version 1.1
@@ -41,7 +41,7 @@ END-INFO-DIR-ENTRY
 @end tex
 
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1994, 1995, 2000 Free Software Foundation, Inc.
+Copyright @copyright{} 1994, 1995, 2000, 2002 Free Software Foundation, Inc.
 
       Permission is granted to copy, distribute and/or modify this document
       under the terms of the GNU Free Documentation License, Version 1.1
@@ -53,7 +53,7 @@ Copyright @copyright{} 1994, 1995, 2000 Free Software Foundation, Inc.
 @end titlepage
 
 @ifinfo
-Copyright @copyright{} 1994, 1995, 2000 Free Software Foundation, Inc.
+Copyright @copyright{} 1994, 1995, 2000, 2002 Free Software Foundation, Inc.
 
 @ignore
 Permission is granted to process this file through TeX and print the
@@ -108,6 +108,11 @@ flexibility: you can use it with hand-coded assembly, without paying a
 penalty of added complexity in the assembler you use for compiler
 output.
 
+@emph{Note} The use of @sc{gas} has now been deprecated.  Anything
+that it could do can now be done by the macro facilities built into
+@sc{gas} itself.  At some point in the future the @{gasp} sources will
+be removed entirely from the binutils distribution.
+
 Here is a small example to give the flavor of @sc{gasp}.  This input to
 @sc{gasp}