X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=.Sanitize;h=f8fad1edd1b38ec1b338a3ea786dddb89b403a64;hb=1a57cd09eaeb6f7f7e8779c7998f4e68d8654d8f;hp=0004600097aec04f38654be8a3a3e4648e2622fa;hpb=c8205c908ea3ec5f4429d37c003b8a50e426d28b;p=deliverable%2Fbinutils-gdb.git

diff --git a/.Sanitize b/.Sanitize
index 0004600097..f8fad1edd1 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -48,12 +48,15 @@ Do-first:
 
 keep_these_too="${keep_these_too} .cvsignore CYGNUS autoconf
 	bfd binutils byacc cvs deja-gnu dejagnu diff dosrel dvips emacs emacs19
-	examples expect fileutils flex gas gcc gdb gdbm gdbtest glob gprof grep
-	groff include install.sh ispell ld libg++ libgcc libgloss libiberty
-	libio librx libstdc++ m4 make mmalloc move-if-change newlib opcodes
-	pagas patch prms rcs readline sed send-pr shellutils sim tcl textutils
-	tk texinfo tgas utils uudecode wdiff xiberty
-	configure.bat makeall.bat
+	examples expect fileutils flex
+	gas gcc gdb gdbm gdbtest glob gprof grep grez groff
+	include install.sh ispell
+	ld libg++ libgcc libgloss libiberty libio librx libstdc++
+	m4 make mmalloc move-if-change newlib opcodes
+	pagas patch prms rcs readline sed send-pr shellutils sim textutils
+	texinfo tgas utils uudecode wdiff xiberty
+	configure.bat makeall.bat winsup
+	guile perl
 	mpw-README mpw-configure mpw-config.in mpw-build.in"
 
 lose_these_too="${lose_these_too} testsuite"
@@ -120,9 +123,6 @@ done
 # called.  Directories not listed will be removed in their entirety
 # with rm -rf.
 
-# ??? It is debatable whether cfg-*.in belongs in Things-to-keep or
-# keep_these_too.  If someone feels strongly about it, please move them.
-
 Things-to-keep:
 
 COPYING
@@ -131,13 +131,13 @@ ChangeLog
 Makefile.in
 README
 config
-cfg-ml-com.in
-cfg-ml-pos.in
+config-ml.in
 config.guess
 config.sub
 configure
 configure.in
 etc
+symlink-tree
 
 Things-to-lose:
 
@@ -202,7 +202,7 @@ if [ -n "${verbose}" ] ; then
 	echo Processing \"arc\"...
 fi
 
-arc_files="config.sub configure.in cfg-ml-com.in"
+arc_files="config.sub configure.in config-ml.in"
 
 if ( echo $* | grep keep\-arc > /dev/null ) ; then
 	for i in $arc_files ; do
@@ -231,24 +231,24 @@ else
 	done
 fi
 
-psion_files="config.sub configure.in"
+rce_files="config.sub"
 
-if ( echo $* | grep keep\-psion > /dev/null ) ; then
-	for i in $psion_files; do
-		if test ! -d $i && (grep sanitize-psion $i > /dev/null) ; then
+if ( echo $* | grep keep\-rce > /dev/null ) ; then
+	for i in $rce_files ; do
+		if test ! -d $i && (grep sanitize-rce $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping psion stuff in $i
+				echo Keeping rce stuff in $i
 			fi
 		fi
 	done
 else
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-psion $i > /dev/null) ; then
+	for i in $rce_files ; do
+		if test ! -d $i && (grep sanitize-rce $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"psion\" from $i...
+				echo Removing traces of \"rce\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-psion/,/end-\sanitize\-psion/d' < $i > new
+			sed '/start\-sanitize\-rce/,/end-\sanitize\-rce/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
@@ -260,24 +260,38 @@ else
 	done
 fi
 
-rce_files="config.sub"
+if ( echo $* | grep lose\-gdbtk > /dev/null ) ; then
+	echo Catering to RMS by removing traces of \"gdbtk\"...
+	if [ -n "${verbose}" ] ; then
+		echo Removing traces of \"gdbtk\" from Makefile.in...
+	fi
+	cp Makefile.in new
+	sed -e '/GDBTK_SUPPORT_DIRS=/d' -e 's/ $(GDBTK_SUPPORT_DIRS)//' < Makefile.in > new
+	if [ -n "${safe}" -a ! -f .Recover/Makefile.in ] ; then
+		if [ -n "${verbose}" ] ; then
+			echo Caching Makefile.in in .Recover...
+		fi
+		mv Makefile.in .Recover
+	fi
+	mv new Makefile.in
+fi
 
-if ( echo $* | grep keep\-rce > /dev/null ) ; then
-	for i in $rce_files ; do
-		if test ! -d $i && (grep sanitize-rce $i > /dev/null) ; then
+if ( echo $* | grep keep\-gm > /dev/null ) ; then
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-gm $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping rce stuff in $i
+				echo Keeping gm stuff in $i
 			fi
 		fi
 	done
 else
-	for i in $rce_files ; do
-		if test ! -d $i && (grep sanitize-rce $i > /dev/null) ; then
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-gm $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"rce\" from $i...
+				echo Removing traces of \"gm\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-rce/,/end-\sanitize\-rce/d' < $i > new
+			sed '/start\-sanitize\-gm/,/end-\sanitize\-gm/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
@@ -289,9 +303,11 @@ else
 	done
 fi
 
+# Do this check LAST!
 for i in * ; do
 	if test ! -d $i && (grep sanitize $i > /dev/null) ; then
 		echo '***' Some mentions of Sanitize are still left in $i! 1>&2
+		exit 1
 	fi
 done