Rebuilt again!

[deliverable/binutils-gdb.git] / .Sanitize

diff --git a/.Sanitize b/.Sanitize
index 38732e81b6e6c4e34002d244881ee5cbe4e89454..3de6800d5ce69112d7ba90c0ddb6bd9635457142 100644 (file)
--- a/.Sanitize
+++ b/.Sanitize
@@ -46,15 +46,15 @@
 
 Do-first:
 
 
 Do-first:
 

-keep_these_too="${keep_these_too} .cvsignore CYGNUS autoconf
+keep_these_too="${keep_these_too} .cvsignore autoconf automake

        apache bash 
        bfd binutils bison byacc cvs deja-gnu dejagnu diff dosrel dvips
        emacs emacs19 examples expect fileutils findutils flex
        gas gawk gcc gdb gdbm gdbtest glob gperf gprof grep grez groff
        guile gzip
        apache bash 
        bfd binutils bison byacc cvs deja-gnu dejagnu diff dosrel dvips
        emacs emacs19 examples expect fileutils findutils flex
        gas gawk gcc gdb gdbm gdbtest glob gperf gprof grep grez groff
        guile gzip

-       include inet install-sh ispell
-       ld less libg++ libgcc libgloss libiberty libio
-       librx libstdc++
+       include inet install-sh intl ispell
+       ld less libgcc libgloss libiberty libio
+       libstdc++ libtool

        m4 make mkinstalldirs mmalloc move-if-change newlib ncurses opcodes
        pagas patch perl prms
        rcs readline sed send-pr shellutils sim tar textutils time
        m4 make mkinstalldirs mmalloc move-if-change newlib ncurses opcodes
        pagas patch perl prms
        rcs readline sed send-pr shellutils sim tar textutils time


@@ -63,9 +63,9 @@ keep_these_too="${keep_these_too} .cvsignore CYGNUS autoconf
        mpw-README mpw-configure mpw-config.in mpw-build.in mpw-install
        ltconfig ltmain.sh missing ylwrap"
 
        mpw-README mpw-configure mpw-config.in mpw-build.in mpw-install
        ltconfig ltmain.sh missing ylwrap"
 

-lose_these_too="${lose_these_too} testsuite"
+lose_these_too="${lose_these_too} libg++ librx testsuite"

 
 

-cygnus_files="release release-info build-all.mk test-build.mk COPYING.NEWLIB"
+cygnus_files="release release-info build-all.mk test-build.mk CYGNUS COPYING.NEWLIB"

 
 if ( echo $* | grep keep\-cygnus > /dev/null) ; then
        keep_these_too="${keep_these_too} ${cygnus_files}"
 
 if ( echo $* | grep keep\-cygnus > /dev/null) ; then
        keep_these_too="${keep_these_too} ${cygnus_files}"


@@ -108,7 +108,7 @@ else
        keep_these_too="${keep_these_too} ${inet_files}"
 fi
 
        keep_these_too="${keep_these_too} ${inet_files}"
 fi
 

-ide_files="libide vmake jstools"
+ide_files="libide libidetcl vmake jstools"

 
 if (echo $* | grep keep\-ide > /dev/null); then
        keep_these_too="${keep_these_too} ${ide_files}"
 
 if (echo $* | grep keep\-ide > /dev/null); then
        keep_these_too="${keep_these_too} ${ide_files}"


@@ -117,6 +117,25 @@ else
        lose_these_too="${lose_these_too} ${ide_files}"
 fi
 
        lose_these_too="${lose_these_too} ${ide_files}"
 fi
 

+flexlm_files="flexlm"
+
+if (echo $* | grep keep\-cygnus > /dev/null); then
+       keep_these_too="${keep_these_too} ${flexlm_files}"
+       test -n "$verbose" && echo Keeping ${flexlm_files}
+else
+       lose_these_too="${lose_these_too} ${flexlm_files}"
+fi
+
+# CGEN files:
+# It is not yet clear if the cgen package will be shipped with the
+# simulators.
+cgen_files="cgen"
+
+if (echo $* | grep keep\-cgen > /dev/null); then
+       keep_these_too="${keep_these_too} ${cgen_files}"
+else
+       lose_these_too="${lose_these_too} ${cgen_files}"
+fi

 
 # This top-level directory is special.  We often check out only subsets
 # of this directory, and complaining about directories or files we didn't
 
 # This top-level directory is special.  We often check out only subsets
 # of this directory, and complaining about directories or files we didn't


@@ -314,6 +333,35 @@ else
        done
 fi
 
        done
 fi
 

+vr4320_files="ChangeLog config.sub"
+
+if ( echo $* | grep keep\-vr4320 > /dev/null ) ; then
+       for i in $vr4320_files ; do
+               if test ! -d $i && (grep sanitize-vr4320 $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Keeping vr4320 stuff in $i
+                       fi
+               fi
+       done
+else
+       for i in * ; do
+               if test ! -d $i && (grep sanitize-vr4320 $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Removing traces of \"vr4320\" from $i...
+                       fi
+                       cp $i new
+                       sed '/start\-sanitize\-vr4320/,/end-\sanitize\-vr4320/d' < $i > new
+                       if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+                               if [ -n "${verbose}" ] ; then
+                                       echo Caching $i in .Recover...
+                               fi
+                               mv $i .Recover
+                       fi
+                       mv new $i
+               fi
+       done
+fi
+

 tx19_files="ChangeLog config.sub"
 
 if ( echo $* | grep keep\-tx19 > /dev/null ) ; then
 tx19_files="ChangeLog config.sub"
 
 if ( echo $* | grep keep\-tx19 > /dev/null ) ; then


@@ -430,35 +478,6 @@ else
        done
 fi
 
        done
 fi
 

-vr4111_files="ChangeLog config.sub"
-
-if ( echo $* | grep keep\-vr4111 > /dev/null ) ; then
-       for i in $vr4111_files ; do
-               if test ! -d $i && (grep sanitize-vr4111 $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Keeping vr4111 stuff in $i
-                       fi
-               fi
-       done
-else
-       for i in * ; do
-               if test ! -d $i && (grep sanitize-vr4111 $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Removing traces of \"vr4111\" from $i...
-                       fi
-                       cp $i new
-                       sed '/start\-sanitize\-vr4111/,/end-\sanitize\-vr4111/d' < $i > new
-                       if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
-                               if [ -n "${verbose}" ] ; then
-                                       echo Caching $i in .Recover...
-                               fi
-                               mv $i .Recover
-                       fi
-                       mv new $i
-               fi
-       done
-fi
-

 if ( echo $* | grep keep\-ide > /dev/null ) ; then
        for i in * ; do
                if test ! -d $i && (grep sanitize-ide $i > /dev/null) ; then
 if ( echo $* | grep keep\-ide > /dev/null ) ; then
        for i in * ; do
                if test ! -d $i && (grep sanitize-ide $i > /dev/null) ; then


@@ -487,7 +506,9 @@ else
 fi
 
 if ( echo $* | grep lose\-gdbtk > /dev/null ) ; then
 fi
 
 if ( echo $* | grep lose\-gdbtk > /dev/null ) ; then

-       echo Catering to RMS by removing traces of \"gdbtk\"...
+       if [ -n "${verbose}" ] ; then
+               echo Catering to RMS by removing traces of \"gdbtk\"...
+       fi

        for i in * ; do
                if test ! -d $i && (grep sanitize-gdbtk $i > /dev/null) ; then
                        if [ -n "${verbose}" ] ; then
        for i in * ; do
                if test ! -d $i && (grep sanitize-gdbtk $i > /dev/null) ; then
                        if [ -n "${verbose}" ] ; then


@@ -496,7 +517,9 @@ if ( echo $* | grep lose\-gdbtk > /dev/null ) ; then
                        cp $i new
                        sed '/start\-sanitize\-gdbtk/,/end-\sanitize\-gdbtk/d' < $i > new
                        if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
                        cp $i new
                        sed '/start\-sanitize\-gdbtk/,/end-\sanitize\-gdbtk/d' < $i > new
                        if [ -n "${safe}" -a ! -f .Recover/$i ] ; then

-                               echo Caching $i in .Recover...
+                               if [ -n "${verbose}" ] ; then
+                                       echo Caching $i in .Recover...
+                               fi

                                mv $i .Recover
                        fi
                        mv new $i
                                mv $i .Recover
                        fi
                        mv new $i


@@ -512,7 +535,9 @@ if ( echo $* | grep lose\-gdbtk > /dev/null ) ; then
        fi
        mv new Makefile.in
 else
        fi
        mv new Makefile.in
 else

-       echo Leaving \"gdbtk\" in the sources...
+       if [ -n "${verbose}" ] ; then
+               echo Leaving \"gdbtk\" in the sources...
+       fi

        for i in * ; do
                if test ! -d $i && (grep sanitize-gdbtk $i > /dev/null) ; then
                        if [ -n "${verbose}" ] ; then
        for i in * ; do
                if test ! -d $i && (grep sanitize-gdbtk $i > /dev/null) ; then
                        if [ -n "${verbose}" ] ; then


@@ -521,7 +546,51 @@ else
                        cp $i new
                        sed -e '/start\-sanitize\-gdbtk/d' -e '/end\-sanitize\-gdbtk/d' < $i > new
                        if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
                        cp $i new
                        sed -e '/start\-sanitize\-gdbtk/d' -e '/end\-sanitize\-gdbtk/d' < $i > new
                        if [ -n "${safe}" -a ! -f .Recover/$i ] ; then

-                               echo Caching $i in .Recover...
+                               if [ -n "${verbose}" ] ; then
+                                       echo Caching $i in .Recover...
+                               fi
+                               mv $i .Recover
+                       fi
+                       mv new $i
+               fi
+       done
+fi
+
+if ( echo $* | grep lose\-mswin > /dev/null ) ; then
+       if [ -n "${verbose}" ] ; then
+               echo Removing traces of \"mswin\"...
+       fi
+       for i in * ; do
+               if test ! -d $i && (grep sanitize-mswin $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Removing traces of \"mswin\" from $i...
+                       fi
+                       cp $i new
+                       sed '/start\-sanitize\-mswin/,/end-\sanitize\-mswin/d' < $i > new
+                       if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+                               if [ -n "${verbose}" ] ; then
+                                       echo Caching $i in .Recover...
+                               fi
+                               mv $i .Recover
+                       fi
+                       mv new $i
+               fi
+       done
+else
+       if [ -n "${verbose}" ] ; then
+               echo Leaving \"mswin\" in the sources...
+       fi
+       for i in * ; do
+               if test ! -d $i && (grep sanitize-mswin $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Keeping \"mswin\" stuff in $i, but editing out sanitize lines...
+                       fi
+                       cp $i new
+                       sed -e '/start\-sanitize\-mswin/d' -e '/end\-sanitize\-mswin/d' < $i > new
+                       if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+                               if [ -n "${verbose}" ] ; then
+                                       echo Caching $i in .Recover...
+                               fi

                                mv $i .Recover
                        fi
                        mv new $i
                                mv $i .Recover
                        fi
                        mv new $i


@@ -586,6 +655,44 @@ else
        done
 fi
 
        done
 fi
 

+kcygnus_files="ChangeLog configure configure.in Makefile.in"
+if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
+       for i in $kcygnus_files ; do
+               if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Keeping Cygnus stuff in $i
+                       fi
+                       cp $i new
+                       grep -v sanitize-cygnus $i > new
+                       if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+                               if [ -n "${verbose}" ] ; then
+                                       echo Caching $i in .Recover...
+                               fi
+                               mv $i .Recover
+                       fi
+                       mv new $i
+               fi
+       done
+else
+       for i in * ; do
+               if test ! -d $i && (grep sanitize-cygnus $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Removing traces of \"cygnus\" from $i...
+                       fi
+                       cp $i new
+                       sed '/start\-sanitize\-cygnus/,/end-\sanitize\-cygnus/d' < $i > new
+                       if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+                               if [ -n "${verbose}" ] ; then
+                                       echo Caching $i in .Recover...
+                               fi
+                               mv $i .Recover
+                       fi
+                       mv new $i
+               fi
+       done
+fi
+
+

 # Do this check LAST!
 for i in * ; do
        if test ! -d $i && (grep sanitize $i > /dev/null) ; then
 # Do this check LAST!
 for i in * ; do
        if test ! -d $i && (grep sanitize $i > /dev/null) ; then