aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid D. Zuhn <zoo@cygnus>1993-01-07 01:43:53 +0000
committerDavid D. Zuhn <zoo@cygnus>1993-01-07 01:43:53 +0000
commitd405f5be8471f4a08844b7f6359ab4816983c56f (patch)
treeff9a58794d7eace2f9f75f9589e67c20797cdcbd
parentb13a565e7515422cab2a77500a1d4d8d6efb6f49 (diff)
downloadgdb-d405f5be8471f4a08844b7f6359ab4816983c56f.zip
gdb-d405f5be8471f4a08844b7f6359ab4816983c56f.tar.gz
gdb-d405f5be8471f4a08844b7f6359ab4816983c56f.tar.bz2
redo (yet again) chill sanitization -- thanks per
-rw-r--r--.Sanitize24
-rw-r--r--Makefile.in47
2 files changed, 40 insertions, 31 deletions
diff --git a/.Sanitize b/.Sanitize
index de82b5c..ce7c344 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -145,30 +145,6 @@ else
mv new $i
fi
done
- echo Thawing more \"chill\" out of Makefile.in...
- cp Makefile.in new
- sed -e 's/ chillrt / /g' \
- -e 's/newlib, chillrt/newlib/g' \
- -e 's/ all-chillrt / /g' \
- -e '/^[ ]*install-chillrt[ ]*\\$/d' \
- -e 's/ install-chillrt / /g' \
- -e 's/newlib \| chillrt/newlib/g' \
- -e 's/install-man install-libchill install-librmt/install-man/g' \
- < Makefile.in > new
- if [ -n "${safe}" -a ! -f .Recover/Makefile.in ] ; then
- echo Caching Makefile.in in .Recover...
- mv Makefile.in .Recover
- fi
- mv new Makefile.in
- echo Thawing the \"chill\" out of configure.in...
- cp configure.in new
- sed -e 's/ chillrt / /g' \
- < configure.in > new
- if [ -n "${safe}" -a ! -f .Recover/configure.in ] ; then
- echo Caching configure.in in .Recover...
- mv configure.in .Recover
- fi
- mv new configure.in
fi
for i in * ; do
diff --git a/Makefile.in b/Makefile.in
index f9068c5..198620c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,7 +78,11 @@ MAKEINFO = `if [ -f $${rootme}/texinfo/C/makeinfo ] ; \
CC_FOR_BUILD = $(CC)
CXX_FOR_BUILD = $(CXX)
-SUBDIRS = libiberty mmalloc glob readline opcodes bfd h8300sim z8ksim gdb binutils ld gas tgas gcc libg++ newlib chillrt deja-gnu
+SUBDIRS = libiberty mmalloc glob readline opcodes bfd h8300sim z8ksim \
+ $(start-sanitize-chill) \
+ chillrt \
+ $(end-sanitize-chill) \
+ gdb binutils ld gas tgas gcc libg++ newlib deja-gnu
OTHERS =
ALL = all.normal
@@ -200,7 +204,7 @@ X11_FLAGS_TO_PASS = \
"X11_LIB_FLAGS=$(X11_LIB_FLAGS)"
# Flags to pass down to makes which are built with the target
-# environment (e.g. libg++, xiberty, newlib, chillrt). -- keep these in alpha order please
+# environment (e.g. libg++, xiberty, newlib). -- keep these in alpha order please
TARGET_FLAGS_TO_PASS = \
"AR=$(AR_FOR_TARGET)" \
"AR_FLAGS=$(AR_FLAGS)" \
@@ -255,14 +259,22 @@ all.normal: all-m4 all-autoconf all-libiberty all-mmalloc all-texinfo \
all-make all-rcs all-cvs all-diff all-grep \
all-patch all-emacs all-ispell all-etc \
all-tcl all-tk all-expect \
- all-newlib all-chillrt all-gprof all-send_pr all-libm all-deja-gnu \
+ all-newlib \
+ $(start-sanitize-chill) \
+ all-chillrt \
+ $(end-sanitize-chill) \
+ all-gprof all-send_pr all-libm all-deja-gnu \
all-fileutils all-find all-gawk all-sed all-shellutils \
all-textutils all-time all-wdiff
all.cross: all-libiberty all-mmalloc all-gas all-byacc all-flex all-ld \
- all-opcodes all-z8ksim all-h8300sim all-bfd all-readline all-gdb all-binutils all-gcc \
- all-newlib all-chillrt all-deja-gnu
+ all-opcodes all-z8ksim all-h8300sim all-bfd all-readline \
+ all-gdb all-binutils all-gcc all-newlib \
+ $(start-sanitize-chill) \
+ all-chillrt \
+ $(end-sanitize-chill) \
+ all-deja-gnu
.PHONY: clean distclean mostlyclean realclean do_clean
@@ -321,7 +333,9 @@ install-no-fixedincludes: install-dirs gcc-no-fixedincludes \
install-make \
install-mmalloc \
install-newlib \
+ $(start-sanitize-chill) \
install-chillrt \
+ $(end-sanitize-chill) \
install-patch \
install-rcs \
install-readline \
@@ -348,7 +362,11 @@ install.cross: install-dirs install-libiberty install-mmalloc \
install-binutils install-opcodes install-byacc install-flex \
install-ld install-gas install-readline \
install-glob install-gdb install-mmalloc \
- install-newlib install-chillrt install-gcc install-etc install-deja-gnu
+ install-newlib \
+ $(start-sanitize-chill) \
+ install-chillrt \
+ $(end-sanitize-chill) \
+ install-gcc install-etc install-deja-gnu
### deja-gnu
all-deja-gnu: force
@@ -1239,13 +1257,28 @@ subdir_do:
@for i in $(DODIRS); do \
if [ -f ./$$i/localenv ] || [ -f ./$$i/Makefile ] ; then \
case $$i in \
- libg++ | xiberty | newlib | chillrt) \
+ libg++ | xiberty | newlib) \
if (rootme=`pwd` ; export rootme ; \
srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
cd ./$$i ; \
$(MAKE) $(TARGET_FLAGS_TO_PASS) $(DO)) ; then true ; \
else exit 1 ; fi \
;; \
+### start-sanitize-chill
+###
+### WARNING: THIS IS VERY UGLY AND I DID NOT DO THIS WILLINGLY
+###
+### if you change the above code for libg++ et al, also change the
+### code down here
+###
+ chillrt) \
+ if (rootme=`pwd` ; export rootme ; \
+ srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
+ cd ./$$i ; \
+ $(MAKE) $(TARGET_FLAGS_TO_PASS) $(DO)) ; then true ; \
+ else exit 1 ; fi \
+ ;; \
+### end-sanitize-chill
*) \
if (rootme=`pwd` ; export rootme ; \
cd ./$$i ; \