diff options
| author | Daniel Berlin <dberlin@dberlin.org> | 2004-09-10 02:19:35 +0000 |
|---|---|---|
| committer | Daniel Berlin <dberlin@dberlin.org> | 2004-09-10 02:19:35 +0000 |
| commit | be75bbe1691231ba95210defdcb3d2848faab73b (patch) | |
| tree | 5ecf34c141df656fe61c411314caa90553790cf0 | |
| parent | 2db8e78e679d88bbdbaf32bdfbed44382f55c0d6 (diff) | |
| download | gdb-be75bbe1691231ba95210defdcb3d2848faab73b.zip gdb-be75bbe1691231ba95210defdcb3d2848faab73b.tar.gz gdb-be75bbe1691231ba95210defdcb3d2848faab73b.tar.bz2 | |
2004-09-09 Daniel Berlin <dberlin@dberlin.org>
* Makefile.def: Remove libbanshee.
* Makefile.tpl: Ditto.
* configure.in: Ditto.
* Makefile.in: Regen.
* configure: Ditto.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.def | 2 | ||||
| -rw-r--r-- | Makefile.in | 722 | ||||
| -rw-r--r-- | Makefile.tpl | 2 | ||||
| -rwxr-xr-x | configure | 192 | ||||
| -rw-r--r-- | configure.in | 17 |
6 files changed, 106 insertions, 837 deletions
@@ -1,3 +1,11 @@ +2004-09-09 Daniel Berlin <dberlin@dberlin.org> + + * Makefile.def: Remove libbanshee. + * Makefile.tpl: Ditto. + * configure.in: Ditto. + * Makefile.in: Regen. + * configure: Ditto. + 2004-09-07 Paolo Bonzini <bonzini@gnu.org> * missing: Import latest version from master repository. diff --git a/Makefile.def b/Makefile.def index c279552..366405a 100644 --- a/Makefile.def +++ b/Makefile.def @@ -70,7 +70,6 @@ host_modules= { module= itcl; }; host_modules= { module= ld; bootstrap=true; }; host_modules= { module= libcpp; bootstrap=true; }; host_modules= { module= libgui; }; -host_modules= { module= libbanshee; bootstrap=true; no_install=true; }; host_modules= { module= libiberty; bootstrap=true; }; host_modules= { module= libtool; }; host_modules= { module= m4; }; @@ -253,7 +252,6 @@ dependencies = { module=all-gcc; on=all-binutils; }; dependencies = { module=all-gcc; on=all-gas; }; dependencies = { module=all-gcc; on=all-ld; }; dependencies = { module=all-gcc; on=all-zlib; }; -dependencies = { module=all-gcc; on=all-libbanshee; }; dependencies = { module=all-gcc; on=all-libcpp; hard=true; }; dependencies = { module=all-gcc; on=all-build-libiberty; }; diff --git a/Makefile.in b/Makefile.in index be99c5b..8047c00 100644 --- a/Makefile.in +++ b/Makefile.in @@ -104,7 +104,7 @@ REALLY_SET_LIB_PATH = \ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); # This is the list of directories to be built for the build system. -BUILD_CONFIGDIRS = libiberty libbanshee +BUILD_CONFIGDIRS = libiberty # Build programs are put under this directory. BUILD_SUBDIR = @build_subdir@ # This is set by the configure script to the arguments to use when configuring @@ -678,7 +678,6 @@ configure-host: \ maybe-configure-ld \ maybe-configure-libcpp \ maybe-configure-libgui \ - maybe-configure-libbanshee \ maybe-configure-libiberty \ maybe-configure-libtool \ maybe-configure-m4 \ @@ -780,7 +779,6 @@ all-host: \ maybe-all-ld \ maybe-all-libcpp \ maybe-all-libgui \ - maybe-all-libbanshee \ maybe-all-libiberty \ maybe-all-libtool \ maybe-all-m4 \ @@ -877,7 +875,6 @@ info-host: \ maybe-info-ld \ maybe-info-libcpp \ maybe-info-libgui \ - maybe-info-libbanshee \ maybe-info-libiberty \ maybe-info-libtool \ maybe-info-m4 \ @@ -970,7 +967,6 @@ dvi-host: \ maybe-dvi-ld \ maybe-dvi-libcpp \ maybe-dvi-libgui \ - maybe-dvi-libbanshee \ maybe-dvi-libiberty \ maybe-dvi-libtool \ maybe-dvi-m4 \ @@ -1063,7 +1059,6 @@ TAGS-host: \ maybe-TAGS-ld \ maybe-TAGS-libcpp \ maybe-TAGS-libgui \ - maybe-TAGS-libbanshee \ maybe-TAGS-libiberty \ maybe-TAGS-libtool \ maybe-TAGS-m4 \ @@ -1156,7 +1151,6 @@ install-info-host: \ maybe-install-info-ld \ maybe-install-info-libcpp \ maybe-install-info-libgui \ - maybe-install-info-libbanshee \ maybe-install-info-libiberty \ maybe-install-info-libtool \ maybe-install-info-m4 \ @@ -1249,7 +1243,6 @@ installcheck-host: \ maybe-installcheck-ld \ maybe-installcheck-libcpp \ maybe-installcheck-libgui \ - maybe-installcheck-libbanshee \ maybe-installcheck-libiberty \ maybe-installcheck-libtool \ maybe-installcheck-m4 \ @@ -1342,7 +1335,6 @@ mostlyclean-host: \ maybe-mostlyclean-ld \ maybe-mostlyclean-libcpp \ maybe-mostlyclean-libgui \ - maybe-mostlyclean-libbanshee \ maybe-mostlyclean-libiberty \ maybe-mostlyclean-libtool \ maybe-mostlyclean-m4 \ @@ -1435,7 +1427,6 @@ clean-host: \ maybe-clean-ld \ maybe-clean-libcpp \ maybe-clean-libgui \ - maybe-clean-libbanshee \ maybe-clean-libiberty \ maybe-clean-libtool \ maybe-clean-m4 \ @@ -1528,7 +1519,6 @@ distclean-host: \ maybe-distclean-ld \ maybe-distclean-libcpp \ maybe-distclean-libgui \ - maybe-distclean-libbanshee \ maybe-distclean-libiberty \ maybe-distclean-libtool \ maybe-distclean-m4 \ @@ -1621,7 +1611,6 @@ maintainer-clean-host: \ maybe-maintainer-clean-ld \ maybe-maintainer-clean-libcpp \ maybe-maintainer-clean-libgui \ - maybe-maintainer-clean-libbanshee \ maybe-maintainer-clean-libiberty \ maybe-maintainer-clean-libtool \ maybe-maintainer-clean-m4 \ @@ -1771,7 +1760,6 @@ do-check: unstage \ maybe-check-ld \ maybe-check-libcpp \ maybe-check-libgui \ - maybe-check-libbanshee \ maybe-check-libiberty \ maybe-check-libtool \ maybe-check-m4 \ @@ -1883,7 +1871,6 @@ install-host-nogcc: \ maybe-install-ld \ maybe-install-libcpp \ maybe-install-libgui \ - maybe-install-libbanshee \ maybe-install-libiberty \ maybe-install-libtool \ maybe-install-m4 \ @@ -1952,7 +1939,6 @@ install-host: \ maybe-install-ld \ maybe-install-libcpp \ maybe-install-libgui \ - maybe-install-libbanshee \ maybe-install-libiberty \ maybe-install-libtool \ maybe-install-m4 \ @@ -12798,305 +12784,6 @@ maintainer-clean-libgui: @endif libgui -.PHONY: configure-libbanshee maybe-configure-libbanshee -maybe-configure-libbanshee: -@if libbanshee -maybe-configure-libbanshee: configure-libbanshee -configure-libbanshee: - @test -f stage_last && exit 0; \ - test ! -f libbanshee/Makefile || exit 0; \ - [ -d libbanshee ] || mkdir libbanshee; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - echo Configuring in libbanshee; \ - cd libbanshee || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/libbanshee"; \ - libsrcdir="$$s/libbanshee";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \ - libsrcdir="$$s/libbanshee";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - || exit 1 -@endif libbanshee - -.PHONY: all-libbanshee maybe-all-libbanshee -maybe-all-libbanshee: -@if libbanshee -maybe-all-libbanshee: all-libbanshee -all-libbanshee: configure-libbanshee - @test -f stage_last && exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd libbanshee && $(MAKE) $(FLAGS_TO_PASS) all) -@endif libbanshee - -.PHONY: check-libbanshee maybe-check-libbanshee -maybe-check-libbanshee: -@if libbanshee -maybe-check-libbanshee: check-libbanshee - -check-libbanshee: - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd libbanshee && $(MAKE) $(FLAGS_TO_PASS) check) - -@endif libbanshee - -.PHONY: install-libbanshee maybe-install-libbanshee -maybe-install-libbanshee: -@if libbanshee -maybe-install-libbanshee: install-libbanshee - -install-libbanshee: - -@endif libbanshee - -# Other targets (info, dvi, etc.) - -.PHONY: maybe-info-libbanshee info-libbanshee -maybe-info-libbanshee: -@if libbanshee -maybe-info-libbanshee: info-libbanshee - -info-libbanshee: \ - configure-libbanshee - @[ -f ./libbanshee/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing info in libbanshee" ; \ - (cd libbanshee && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - info) \ - || exit 1 - -@endif libbanshee - -.PHONY: maybe-dvi-libbanshee dvi-libbanshee -maybe-dvi-libbanshee: -@if libbanshee -maybe-dvi-libbanshee: dvi-libbanshee - -dvi-libbanshee: \ - configure-libbanshee - @[ -f ./libbanshee/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing dvi in libbanshee" ; \ - (cd libbanshee && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ - || exit 1 - -@endif libbanshee - -.PHONY: maybe-TAGS-libbanshee TAGS-libbanshee -maybe-TAGS-libbanshee: -@if libbanshee -maybe-TAGS-libbanshee: TAGS-libbanshee - -TAGS-libbanshee: \ - configure-libbanshee - @[ -f ./libbanshee/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing TAGS in libbanshee" ; \ - (cd libbanshee && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - TAGS) \ - || exit 1 - -@endif libbanshee - -.PHONY: maybe-install-info-libbanshee install-info-libbanshee -maybe-install-info-libbanshee: -@if libbanshee -maybe-install-info-libbanshee: install-info-libbanshee - -install-info-libbanshee: \ - configure-libbanshee \ - info-libbanshee - @[ -f ./libbanshee/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing install-info in libbanshee" ; \ - (cd libbanshee && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - install-info) \ - || exit 1 - -@endif libbanshee - -.PHONY: maybe-installcheck-libbanshee installcheck-libbanshee -maybe-installcheck-libbanshee: -@if libbanshee -maybe-installcheck-libbanshee: installcheck-libbanshee - -installcheck-libbanshee: \ - configure-libbanshee - @[ -f ./libbanshee/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing installcheck in libbanshee" ; \ - (cd libbanshee && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - installcheck) \ - || exit 1 - -@endif libbanshee - -.PHONY: maybe-mostlyclean-libbanshee mostlyclean-libbanshee -maybe-mostlyclean-libbanshee: -@if libbanshee -maybe-mostlyclean-libbanshee: mostlyclean-libbanshee - -mostlyclean-libbanshee: - @[ -f ./libbanshee/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing mostlyclean in libbanshee" ; \ - (cd libbanshee && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - mostlyclean) \ - || exit 1 - -@endif libbanshee - -.PHONY: maybe-clean-libbanshee clean-libbanshee -maybe-clean-libbanshee: -@if libbanshee -maybe-clean-libbanshee: clean-libbanshee - -clean-libbanshee: - @[ -f ./libbanshee/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing clean in libbanshee" ; \ - (cd libbanshee && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - clean) \ - || exit 1 - -@endif libbanshee - -.PHONY: maybe-distclean-libbanshee distclean-libbanshee -maybe-distclean-libbanshee: -@if libbanshee -maybe-distclean-libbanshee: distclean-libbanshee - -distclean-libbanshee: - @[ -f ./libbanshee/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing distclean in libbanshee" ; \ - (cd libbanshee && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - distclean) \ - || exit 1 - -@endif libbanshee - -.PHONY: maybe-maintainer-clean-libbanshee maintainer-clean-libbanshee -maybe-maintainer-clean-libbanshee: -@if libbanshee -maybe-maintainer-clean-libbanshee: maintainer-clean-libbanshee - -maintainer-clean-libbanshee: - @[ -f ./libbanshee/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing maintainer-clean in libbanshee" ; \ - (cd libbanshee && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - maintainer-clean) \ - || exit 1 - -@endif libbanshee - - .PHONY: configure-libiberty maybe-configure-libiberty maybe-configure-libiberty: @if libiberty @@ -28255,10 +27942,6 @@ stage1-start:: @[ -d stage1-libcpp ] || mkdir stage1-libcpp; \ set stage1-libcpp libcpp ; @CREATE_LINK_TO_DIR@ @endif libcpp -@if libbanshee - @[ -d stage1-libbanshee ] || mkdir stage1-libbanshee; \ - set stage1-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@ -@endif libbanshee @if libiberty @[ -d stage1-libiberty ] || mkdir stage1-libiberty; \ set stage1-libiberty libiberty ; @CREATE_LINK_TO_DIR@ @@ -28294,9 +27977,6 @@ stage1-end:: @if libcpp @set libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ @endif libcpp -@if libbanshee - @set libbanshee stage1-libbanshee ; @UNDO_LINK_TO_DIR@ -@endif libbanshee @if libiberty @set libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ @endif libiberty @@ -28325,7 +28005,6 @@ all-stage1: \ maybe-all-stage1-intl \ maybe-all-stage1-ld \ maybe-all-stage1-libcpp \ - maybe-all-stage1-libbanshee \ maybe-all-stage1-libiberty \ maybe-all-stage1-zlib @@ -28339,7 +28018,6 @@ clean-stage1: \ maybe-clean-stage1-intl \ maybe-clean-stage1-ld \ maybe-clean-stage1-libcpp \ - maybe-clean-stage1-libbanshee \ maybe-clean-stage1-libiberty \ maybe-clean-stage1-zlib @@ -28776,60 +28454,6 @@ clean-stage1-libcpp: @endif libcpp-bootstrap -.PHONY: configure-stage1-libbanshee maybe-configure-stage1-libbanshee -.PHONY: all-stage1-libbanshee maybe-all-stage1-libbanshee -.PHONY: clean-stage1-libbanshee maybe-clean-stage1-libbanshee - -maybe-configure-stage1-libbanshee: -maybe-all-stage1-libbanshee: -maybe-clean-stage1-libbanshee: - -@if libbanshee-bootstrap -maybe-configure-stage1-libbanshee: configure-stage1-libbanshee -configure-stage1-libbanshee: - @$(MAKE) stage1-start - @[ -f libbanshee/Makefile ] && exit 0 || : ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - echo Configuring stage 1 in libbanshee ; \ - cd libbanshee || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/libbanshee"; \ - libsrcdir="$$s/libbanshee";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \ - libsrcdir="$$s/libbanshee";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" - -maybe-all-stage1-libbanshee: all-stage1-libbanshee -all-stage1-libbanshee: configure-stage1-libbanshee - @$(MAKE) stage1-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - cd libbanshee && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" - -maybe-clean-stage1-libbanshee: clean-stage1-libbanshee -clean-stage1-libbanshee: - @[ -f libbanshee/Makefile ] || [ -f stage1-libbanshee/Makefile ] \ - || exit 0 ; \ - [ -f libbanshee/Makefile ] || $(MAKE) stage1-start ; \ - cd libbanshee && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" clean -@endif libbanshee-bootstrap - - .PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty .PHONY: all-stage1-libiberty maybe-all-stage1-libiberty .PHONY: clean-stage1-libiberty maybe-clean-stage1-libiberty @@ -29003,11 +28627,6 @@ stage2-start:: set stage2-libcpp libcpp ; @CREATE_LINK_TO_DIR@ ; \ set stage1-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ @endif libcpp -@if libbanshee - @[ -d stage2-libbanshee ] || mkdir stage2-libbanshee; \ - set stage2-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@ ; \ - set stage1-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@ -@endif libbanshee @if libiberty @[ -d stage2-libiberty ] || mkdir stage2-libiberty; \ set stage2-libiberty libiberty ; @CREATE_LINK_TO_DIR@ ; \ @@ -29053,10 +28672,6 @@ stage2-end:: @set libcpp stage2-libcpp ; @UNDO_LINK_TO_DIR@ ; \ set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ @endif libcpp -@if libbanshee - @set libbanshee stage2-libbanshee ; @UNDO_LINK_TO_DIR@ ; \ - set prev-libbanshee stage1-libbanshee ; @UNDO_LINK_TO_DIR@ -@endif libbanshee @if libiberty @set libiberty stage2-libiberty ; @UNDO_LINK_TO_DIR@ ; \ set prev-libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ @@ -29087,7 +28702,6 @@ all-stage2: \ maybe-all-stage2-intl \ maybe-all-stage2-ld \ maybe-all-stage2-libcpp \ - maybe-all-stage2-libbanshee \ maybe-all-stage2-libiberty \ maybe-all-stage2-zlib @@ -29101,7 +28715,6 @@ clean-stage2: \ maybe-clean-stage2-intl \ maybe-clean-stage2-ld \ maybe-clean-stage2-libcpp \ - maybe-clean-stage2-libbanshee \ maybe-clean-stage2-libiberty \ maybe-clean-stage2-zlib @@ -29554,62 +29167,6 @@ clean-stage2-libcpp: @endif libcpp-bootstrap -.PHONY: configure-stage2-libbanshee maybe-configure-stage2-libbanshee -.PHONY: all-stage2-libbanshee maybe-all-stage2-libbanshee -.PHONY: clean-stage2-libbanshee maybe-clean-stage2-libbanshee - -maybe-configure-stage2-libbanshee: -maybe-all-stage2-libbanshee: -maybe-clean-stage2-libbanshee: - -@if libbanshee-bootstrap -maybe-configure-stage2-libbanshee: configure-stage2-libbanshee -configure-stage2-libbanshee: - @$(MAKE) stage2-start - @[ -f libbanshee/Makefile ] && exit 0 || : ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - echo Configuring stage 2 in libbanshee ; \ - cd libbanshee || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/libbanshee"; \ - libsrcdir="$$s/libbanshee";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \ - libsrcdir="$$s/libbanshee";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ - -maybe-all-stage2-libbanshee: all-stage2-libbanshee -all-stage2-libbanshee: configure-stage2-libbanshee - @$(MAKE) stage2-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - cd libbanshee && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - - -maybe-clean-stage2-libbanshee: clean-stage2-libbanshee -clean-stage2-libbanshee: - @[ -f libbanshee/Makefile ] || [ -f stage2-libbanshee/Makefile ] \ - || exit 0 ; \ - [ -f libbanshee/Makefile ] || $(MAKE) stage2-start ; \ - cd libbanshee && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif libbanshee-bootstrap - - .PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty .PHONY: all-stage2-libiberty maybe-all-stage2-libiberty .PHONY: clean-stage2-libiberty maybe-clean-stage2-libiberty @@ -29790,11 +29347,6 @@ stage3-start:: set stage3-libcpp libcpp ; @CREATE_LINK_TO_DIR@ ; \ set stage2-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ @endif libcpp -@if libbanshee - @[ -d stage3-libbanshee ] || mkdir stage3-libbanshee; \ - set stage3-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@ ; \ - set stage2-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@ -@endif libbanshee @if libiberty @[ -d stage3-libiberty ] || mkdir stage3-libiberty; \ set stage3-libiberty libiberty ; @CREATE_LINK_TO_DIR@ ; \ @@ -29840,10 +29392,6 @@ stage3-end:: @set libcpp stage3-libcpp ; @UNDO_LINK_TO_DIR@ ; \ set prev-libcpp stage2-libcpp ; @UNDO_LINK_TO_DIR@ @endif libcpp -@if libbanshee - @set libbanshee stage3-libbanshee ; @UNDO_LINK_TO_DIR@ ; \ - set prev-libbanshee stage2-libbanshee ; @UNDO_LINK_TO_DIR@ -@endif libbanshee @if libiberty @set libiberty stage3-libiberty ; @UNDO_LINK_TO_DIR@ ; \ set prev-libiberty stage2-libiberty ; @UNDO_LINK_TO_DIR@ @@ -29875,7 +29423,6 @@ all-stage3: \ maybe-all-stage3-intl \ maybe-all-stage3-ld \ maybe-all-stage3-libcpp \ - maybe-all-stage3-libbanshee \ maybe-all-stage3-libiberty \ maybe-all-stage3-zlib @@ -29889,7 +29436,6 @@ clean-stage3: \ maybe-clean-stage3-intl \ maybe-clean-stage3-ld \ maybe-clean-stage3-libcpp \ - maybe-clean-stage3-libbanshee \ maybe-clean-stage3-libiberty \ maybe-clean-stage3-zlib @@ -30342,62 +29888,6 @@ clean-stage3-libcpp: @endif libcpp-bootstrap -.PHONY: configure-stage3-libbanshee maybe-configure-stage3-libbanshee -.PHONY: all-stage3-libbanshee maybe-all-stage3-libbanshee -.PHONY: clean-stage3-libbanshee maybe-clean-stage3-libbanshee - -maybe-configure-stage3-libbanshee: -maybe-all-stage3-libbanshee: -maybe-clean-stage3-libbanshee: - -@if libbanshee-bootstrap -maybe-configure-stage3-libbanshee: configure-stage3-libbanshee -configure-stage3-libbanshee: - @$(MAKE) stage3-start - @[ -f libbanshee/Makefile ] && exit 0 || : ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - echo Configuring stage 3 in libbanshee ; \ - cd libbanshee || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/libbanshee"; \ - libsrcdir="$$s/libbanshee";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \ - libsrcdir="$$s/libbanshee";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ - -maybe-all-stage3-libbanshee: all-stage3-libbanshee -all-stage3-libbanshee: configure-stage3-libbanshee - @$(MAKE) stage3-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - cd libbanshee && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - - -maybe-clean-stage3-libbanshee: clean-stage3-libbanshee -clean-stage3-libbanshee: - @[ -f libbanshee/Makefile ] || [ -f stage3-libbanshee/Makefile ] \ - || exit 0 ; \ - [ -f libbanshee/Makefile ] || $(MAKE) stage3-start ; \ - cd libbanshee && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif libbanshee-bootstrap - - .PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty .PHONY: all-stage3-libiberty maybe-all-stage3-libiberty .PHONY: clean-stage3-libiberty maybe-clean-stage3-libiberty @@ -30608,11 +30098,6 @@ stage4-start:: set stage4-libcpp libcpp ; @CREATE_LINK_TO_DIR@ ; \ set stage3-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ @endif libcpp -@if libbanshee - @[ -d stage4-libbanshee ] || mkdir stage4-libbanshee; \ - set stage4-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@ ; \ - set stage3-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@ -@endif libbanshee @if libiberty @[ -d stage4-libiberty ] || mkdir stage4-libiberty; \ set stage4-libiberty libiberty ; @CREATE_LINK_TO_DIR@ ; \ @@ -30658,10 +30143,6 @@ stage4-end:: @set libcpp stage4-libcpp ; @UNDO_LINK_TO_DIR@ ; \ set prev-libcpp stage3-libcpp ; @UNDO_LINK_TO_DIR@ @endif libcpp -@if libbanshee - @set libbanshee stage4-libbanshee ; @UNDO_LINK_TO_DIR@ ; \ - set prev-libbanshee stage3-libbanshee ; @UNDO_LINK_TO_DIR@ -@endif libbanshee @if libiberty @set libiberty stage4-libiberty ; @UNDO_LINK_TO_DIR@ ; \ set prev-libiberty stage3-libiberty ; @UNDO_LINK_TO_DIR@ @@ -30693,7 +30174,6 @@ all-stage4: \ maybe-all-stage4-intl \ maybe-all-stage4-ld \ maybe-all-stage4-libcpp \ - maybe-all-stage4-libbanshee \ maybe-all-stage4-libiberty \ maybe-all-stage4-zlib @@ -30707,7 +30187,6 @@ clean-stage4: \ maybe-clean-stage4-intl \ maybe-clean-stage4-ld \ maybe-clean-stage4-libcpp \ - maybe-clean-stage4-libbanshee \ maybe-clean-stage4-libiberty \ maybe-clean-stage4-zlib @@ -31160,62 +30639,6 @@ clean-stage4-libcpp: @endif libcpp-bootstrap -.PHONY: configure-stage4-libbanshee maybe-configure-stage4-libbanshee -.PHONY: all-stage4-libbanshee maybe-all-stage4-libbanshee -.PHONY: clean-stage4-libbanshee maybe-clean-stage4-libbanshee - -maybe-configure-stage4-libbanshee: -maybe-all-stage4-libbanshee: -maybe-clean-stage4-libbanshee: - -@if libbanshee-bootstrap -maybe-configure-stage4-libbanshee: configure-stage4-libbanshee -configure-stage4-libbanshee: - @$(MAKE) stage4-start - @[ -f libbanshee/Makefile ] && exit 0 || : ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - echo Configuring stage 4 in libbanshee ; \ - cd libbanshee || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/libbanshee"; \ - libsrcdir="$$s/libbanshee";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \ - libsrcdir="$$s/libbanshee";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ - -maybe-all-stage4-libbanshee: all-stage4-libbanshee -all-stage4-libbanshee: configure-stage4-libbanshee - @$(MAKE) stage4-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - cd libbanshee && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - - -maybe-clean-stage4-libbanshee: clean-stage4-libbanshee -clean-stage4-libbanshee: - @[ -f libbanshee/Makefile ] || [ -f stage4-libbanshee/Makefile ] \ - || exit 0 ; \ - [ -f libbanshee/Makefile ] || $(MAKE) stage4-start ; \ - cd libbanshee && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif libbanshee-bootstrap - - .PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty .PHONY: all-stage4-libiberty maybe-all-stage4-libiberty .PHONY: clean-stage4-libiberty maybe-clean-stage4-libiberty @@ -31423,11 +30846,6 @@ stageprofile-start:: set stageprofile-libcpp libcpp ; @CREATE_LINK_TO_DIR@ ; \ set stage1-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ @endif libcpp -@if libbanshee - @[ -d stageprofile-libbanshee ] || mkdir stageprofile-libbanshee; \ - set stageprofile-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@ ; \ - set stage1-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@ -@endif libbanshee @if libiberty @[ -d stageprofile-libiberty ] || mkdir stageprofile-libiberty; \ set stageprofile-libiberty libiberty ; @CREATE_LINK_TO_DIR@ ; \ @@ -31473,10 +30891,6 @@ stageprofile-end:: @set libcpp stageprofile-libcpp ; @UNDO_LINK_TO_DIR@ ; \ set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ @endif libcpp -@if libbanshee - @set libbanshee stageprofile-libbanshee ; @UNDO_LINK_TO_DIR@ ; \ - set prev-libbanshee stage1-libbanshee ; @UNDO_LINK_TO_DIR@ -@endif libbanshee @if libiberty @set libiberty stageprofile-libiberty ; @UNDO_LINK_TO_DIR@ ; \ set prev-libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ @@ -31507,7 +30921,6 @@ all-stageprofile: \ maybe-all-stageprofile-intl \ maybe-all-stageprofile-ld \ maybe-all-stageprofile-libcpp \ - maybe-all-stageprofile-libbanshee \ maybe-all-stageprofile-libiberty \ maybe-all-stageprofile-zlib @@ -31521,7 +30934,6 @@ clean-stageprofile: \ maybe-clean-stageprofile-intl \ maybe-clean-stageprofile-ld \ maybe-clean-stageprofile-libcpp \ - maybe-clean-stageprofile-libbanshee \ maybe-clean-stageprofile-libiberty \ maybe-clean-stageprofile-zlib @@ -31974,62 +31386,6 @@ clean-stageprofile-libcpp: @endif libcpp-bootstrap -.PHONY: configure-stageprofile-libbanshee maybe-configure-stageprofile-libbanshee -.PHONY: all-stageprofile-libbanshee maybe-all-stageprofile-libbanshee -.PHONY: clean-stageprofile-libbanshee maybe-clean-stageprofile-libbanshee - -maybe-configure-stageprofile-libbanshee: -maybe-all-stageprofile-libbanshee: -maybe-clean-stageprofile-libbanshee: - -@if libbanshee-bootstrap -maybe-configure-stageprofile-libbanshee: configure-stageprofile-libbanshee -configure-stageprofile-libbanshee: - @$(MAKE) stageprofile-start - @[ -f libbanshee/Makefile ] && exit 0 || : ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - echo Configuring stage profile in libbanshee ; \ - cd libbanshee || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/libbanshee"; \ - libsrcdir="$$s/libbanshee";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \ - libsrcdir="$$s/libbanshee";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ - -maybe-all-stageprofile-libbanshee: all-stageprofile-libbanshee -all-stageprofile-libbanshee: configure-stageprofile-libbanshee - @$(MAKE) stageprofile-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - cd libbanshee && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" - -maybe-clean-stageprofile-libbanshee: clean-stageprofile-libbanshee -clean-stageprofile-libbanshee: - @[ -f libbanshee/Makefile ] || [ -f stageprofile-libbanshee/Makefile ] \ - || exit 0 ; \ - [ -f libbanshee/Makefile ] || $(MAKE) stageprofile-start ; \ - cd libbanshee && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean -@endif libbanshee-bootstrap - - .PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty .PHONY: all-stageprofile-libiberty maybe-all-stageprofile-libiberty .PHONY: clean-stageprofile-libiberty maybe-clean-stageprofile-libiberty @@ -32207,11 +31563,6 @@ stagefeedback-start:: set stagefeedback-libcpp libcpp ; @CREATE_LINK_TO_DIR@ ; \ set stage1-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ @endif libcpp -@if libbanshee - @[ -d stagefeedback-libbanshee ] || mkdir stagefeedback-libbanshee; \ - set stagefeedback-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@ ; \ - set stage1-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@ -@endif libbanshee @if libiberty @[ -d stagefeedback-libiberty ] || mkdir stagefeedback-libiberty; \ set stagefeedback-libiberty libiberty ; @CREATE_LINK_TO_DIR@ ; \ @@ -32257,10 +31608,6 @@ stagefeedback-end:: @set libcpp stagefeedback-libcpp ; @UNDO_LINK_TO_DIR@ ; \ set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ @endif libcpp -@if libbanshee - @set libbanshee stagefeedback-libbanshee ; @UNDO_LINK_TO_DIR@ ; \ - set prev-libbanshee stage1-libbanshee ; @UNDO_LINK_TO_DIR@ -@endif libbanshee @if libiberty @set libiberty stagefeedback-libiberty ; @UNDO_LINK_TO_DIR@ ; \ set prev-libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ @@ -32291,7 +31638,6 @@ all-stagefeedback: \ maybe-all-stagefeedback-intl \ maybe-all-stagefeedback-ld \ maybe-all-stagefeedback-libcpp \ - maybe-all-stagefeedback-libbanshee \ maybe-all-stagefeedback-libiberty \ maybe-all-stagefeedback-zlib @@ -32305,7 +31651,6 @@ clean-stagefeedback: \ maybe-clean-stagefeedback-intl \ maybe-clean-stagefeedback-ld \ maybe-clean-stagefeedback-libcpp \ - maybe-clean-stagefeedback-libbanshee \ maybe-clean-stagefeedback-libiberty \ maybe-clean-stagefeedback-zlib @@ -32758,62 +32103,6 @@ clean-stagefeedback-libcpp: @endif libcpp-bootstrap -.PHONY: configure-stagefeedback-libbanshee maybe-configure-stagefeedback-libbanshee -.PHONY: all-stagefeedback-libbanshee maybe-all-stagefeedback-libbanshee -.PHONY: clean-stagefeedback-libbanshee maybe-clean-stagefeedback-libbanshee - -maybe-configure-stagefeedback-libbanshee: -maybe-all-stagefeedback-libbanshee: -maybe-clean-stagefeedback-libbanshee: - -@if libbanshee-bootstrap -maybe-configure-stagefeedback-libbanshee: configure-stagefeedback-libbanshee -configure-stagefeedback-libbanshee: - @$(MAKE) stagefeedback-start - @[ -f libbanshee/Makefile ] && exit 0 || : ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - echo Configuring stage feedback in libbanshee ; \ - cd libbanshee || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/libbanshee"; \ - libsrcdir="$$s/libbanshee";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \ - libsrcdir="$$s/libbanshee";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ - -maybe-all-stagefeedback-libbanshee: all-stagefeedback-libbanshee -all-stagefeedback-libbanshee: configure-stagefeedback-libbanshee - @$(MAKE) stagefeedback-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - cd libbanshee && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-use" - -maybe-clean-stagefeedback-libbanshee: clean-stagefeedback-libbanshee -clean-stagefeedback-libbanshee: - @[ -f libbanshee/Makefile ] || [ -f stagefeedback-libbanshee/Makefile ] \ - || exit 0 ; \ - [ -f libbanshee/Makefile ] || $(MAKE) stagefeedback-start ; \ - cd libbanshee && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean -@endif libbanshee-bootstrap - - .PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty .PHONY: all-stagefeedback-libiberty maybe-all-stagefeedback-libiberty .PHONY: clean-stagefeedback-libiberty maybe-clean-stagefeedback-libiberty @@ -33216,14 +32505,6 @@ all-stage3-gcc: maybe-all-stage3-zlib all-stage4-gcc: maybe-all-stage4-zlib all-stageprofile-gcc: maybe-all-stageprofile-zlib all-stagefeedback-gcc: maybe-all-stagefeedback-zlib -all-gcc: maybe-all-libbanshee - -all-stage1-gcc: maybe-all-stage1-libbanshee -all-stage2-gcc: maybe-all-stage2-libbanshee -all-stage3-gcc: maybe-all-stage3-libbanshee -all-stage4-gcc: maybe-all-stage4-libbanshee -all-stageprofile-gcc: maybe-all-stageprofile-libbanshee -all-stagefeedback-gcc: maybe-all-stagefeedback-libbanshee all-gcc: all-libcpp all-stage1-gcc: all-stage1-libcpp @@ -33582,7 +32863,6 @@ all-prebootstrap: maybe-all-gas all-prebootstrap: maybe-all-intl all-prebootstrap: maybe-all-ld all-prebootstrap: maybe-all-libcpp -all-prebootstrap: maybe-all-libbanshee all-prebootstrap: maybe-all-libiberty all-prebootstrap: maybe-all-zlib @endif gcc-no-bootstrap diff --git a/Makefile.tpl b/Makefile.tpl index 8dbf237..d685c39 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -107,7 +107,7 @@ REALLY_SET_LIB_PATH = \ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); # This is the list of directories to be built for the build system. -BUILD_CONFIGDIRS = libiberty libbanshee +BUILD_CONFIGDIRS = libiberty # Build programs are put under this directory. BUILD_SUBDIR = @build_subdir@ # This is set by the configure script to the arguments to use when configuring @@ -12,8 +12,6 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - --without-libbanshee Don't build with libbanshee" -ac_help="$ac_help --enable-libada Builds libada directory" ac_help="$ac_help --with-mpfr-dir=PATH Specify source directory for MPFR library" @@ -593,7 +591,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:597: checking host system type" >&5 +echo "configure:595: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -614,7 +612,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:618: checking target system type" >&5 +echo "configure:616: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -632,7 +630,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:636: checking build system type" >&5 +echo "configure:634: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -687,7 +685,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:691: checking for a BSD compatible install" >&5 +echo "configure:689: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -740,7 +738,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln works""... $ac_c" 1>&6 -echo "configure:744: checking whether ln works" >&5 +echo "configure:742: checking whether ln works" >&5 if eval "test \"`echo '$''{'acx_cv_prog_LN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -764,7 +762,7 @@ else fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:768: checking whether ln -s works" >&5 +echo "configure:766: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -891,7 +889,7 @@ build_tools="build-texinfo build-byacc build-flex build-bison build-m4 build-fix # these libraries are used by various programs built for the host environment # -host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libbanshee libcpp" +host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp" # these tools are built for the host environment # Note, the powerpc-eabi build depends on sim occurring before gdb in order to @@ -1084,21 +1082,6 @@ case "${host}" in ;; esac -# Check whether --with-libbanshee or --without-libbanshee was given. -if test "${with_libbanshee+set}" = set; then - withval="$with_libbanshee" - : -fi - -case ${with_libbanshee} in - no) - noconfigdirs="$noconfigdirs libbanshee" ;; - yes|"") - with_libbanshee=yes - ;; - *) - { echo "configure: error: --with-libbanshee can only be empty, "yes" or "no" (empty defaults to "yes"." 1>&2; exit 1; } -esac # Check whether --enable-libada or --disable-libada was given. if test "${enable_libada+set}" = set; then @@ -1788,7 +1771,7 @@ else # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1792: checking for $ac_word" >&5 +echo "configure:1775: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1818,7 +1801,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1822: checking for $ac_word" >&5 +echo "configure:1805: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1869,7 +1852,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1873: checking for $ac_word" >&5 +echo "configure:1856: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1901,7 +1884,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1905: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1888: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1912,12 +1895,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1916 "configure" +#line 1899 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1943,12 +1926,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1947: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1930: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1952: checking whether we are using GNU C" >&5 +echo "configure:1935: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1957,7 +1940,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1976,7 +1959,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1980: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1963: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2043,7 +2026,7 @@ fi # Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args. set dummy ${ac_tool_prefix}gnatbind; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2047: checking for $ac_word" >&5 +echo "configure:2030: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2075,7 +2058,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "gnatbind", so it can be a program name with args. set dummy gnatbind; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2079: checking for $ac_word" >&5 +echo "configure:2062: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2108,7 +2091,7 @@ fi fi echo $ac_n "checking whether compiler driver understands Ada""... $ac_c" 1>&6 -echo "configure:2112: checking whether compiler driver understands Ada" >&5 +echo "configure:2095: checking whether compiler driver understands Ada" >&5 if eval "test \"`echo '$''{'acx_cv_cc_gcc_supports_ada'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2141,7 +2124,7 @@ else fi echo $ac_n "checking how to compare bootstrapped objects""... $ac_c" 1>&6 -echo "configure:2145: checking how to compare bootstrapped objects" >&5 +echo "configure:2128: checking how to compare bootstrapped objects" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_cmp_skip'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2239,9 +2222,9 @@ saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $gmpinc" # Check GMP actually works echo $ac_n "checking for correct version of gmp.h""... $ac_c" 1>&6 -echo "configure:2243: checking for correct version of gmp.h" >&5 +echo "configure:2226: checking for correct version of gmp.h" >&5 cat > conftest.$ac_ext <<EOF -#line 2245 "configure" +#line 2228 "configure" #include "confdefs.h" #include "gmp.h" int main() { @@ -2252,7 +2235,7 @@ choke me ; return 0; } EOF -if { (eval echo configure:2256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -2265,12 +2248,12 @@ rm -f conftest* if test x"$have_gmp" = xyes; then echo $ac_n "checking for MPFR""... $ac_c" 1>&6 -echo "configure:2269: checking for MPFR" >&5 +echo "configure:2252: checking for MPFR" >&5 saved_LIBS="$LIBS" LIBS="$LIBS $gmplibs" cat > conftest.$ac_ext <<EOF -#line 2274 "configure" +#line 2257 "configure" #include "confdefs.h" #include <gmp.h> #include <mpfr.h> @@ -2278,7 +2261,7 @@ int main() { mpfr_t n; mpfr_init(n); ; return 0; } EOF -if { (eval echo configure:2282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -2721,10 +2704,6 @@ if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target- extra_host_args="$extra_host_args --with-newlib" fi -if test x${with_libbanshee} = xyes && echo " ${configdirs} " | grep " libbanshee " >/dev/null 2>&1; then - extra_host_args="$extra_host_args --with-libbanshee" -fi - # Default to using --with-stabs for certain targets. if test x${with_stabs} = x ; then case "${target}" in @@ -2759,7 +2738,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2766: checking for $ac_word" >&5 +echo "configure:2742: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2794,7 +2773,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2801: checking for $ac_word" >&5 +echo "configure:2777: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2829,7 +2808,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2836: checking for $ac_word" >&5 +echo "configure:2812: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_M4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2864,7 +2843,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2871: checking for $ac_word" >&5 +echo "configure:2847: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2899,7 +2878,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2906: checking for $ac_word" >&5 +echo "configure:2882: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2934,7 +2913,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2941: checking for $ac_word" >&5 +echo "configure:2917: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3568,7 +3547,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias- # Extract the first word of "${ncn_tool_prefix}ar", so it can be a program name with args. set dummy ${ncn_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3575: checking for $ac_word" >&5 +echo "configure:3551: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3601,7 +3580,7 @@ if test -z "$ac_cv_prog_AR" ; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3608: checking for $ac_word" >&5 +echo "configure:3584: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3640,7 +3619,7 @@ fi # Extract the first word of "${ncn_tool_prefix}as", so it can be a program name with args. set dummy ${ncn_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3647: checking for $ac_word" >&5 +echo "configure:3623: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3673,7 +3652,7 @@ if test -z "$ac_cv_prog_AS" ; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3680: checking for $ac_word" >&5 +echo "configure:3656: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3712,7 +3691,7 @@ fi # Extract the first word of "${ncn_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ncn_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3719: checking for $ac_word" >&5 +echo "configure:3695: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3745,7 +3724,7 @@ if test -z "$ac_cv_prog_DLLTOOL" ; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3752: checking for $ac_word" >&5 +echo "configure:3728: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3784,7 +3763,7 @@ fi # Extract the first word of "${ncn_tool_prefix}ld", so it can be a program name with args. set dummy ${ncn_tool_prefix}ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3791: checking for $ac_word" >&5 +echo "configure:3767: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3817,7 +3796,7 @@ if test -z "$ac_cv_prog_LD" ; then # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3824: checking for $ac_word" >&5 +echo "configure:3800: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3856,7 +3835,7 @@ fi # Extract the first word of "${ncn_tool_prefix}nm", so it can be a program name with args. set dummy ${ncn_tool_prefix}nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3863: checking for $ac_word" >&5 +echo "configure:3839: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3889,7 +3868,7 @@ if test -z "$ac_cv_prog_NM" ; then # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3896: checking for $ac_word" >&5 +echo "configure:3872: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3928,7 +3907,7 @@ fi # Extract the first word of "${ncn_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ncn_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3935: checking for $ac_word" >&5 +echo "configure:3911: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3961,7 +3940,7 @@ if test -z "$ac_cv_prog_RANLIB" ; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3968: checking for $ac_word" >&5 +echo "configure:3944: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4000,7 +3979,7 @@ fi # Extract the first word of "${ncn_tool_prefix}windres", so it can be a program name with args. set dummy ${ncn_tool_prefix}windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4007: checking for $ac_word" >&5 +echo "configure:3983: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4033,7 +4012,7 @@ if test -z "$ac_cv_prog_WINDRES" ; then # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4040: checking for $ac_word" >&5 +echo "configure:4016: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4072,7 +4051,7 @@ fi # Extract the first word of "${ncn_tool_prefix}objcopy", so it can be a program name with args. set dummy ${ncn_tool_prefix}objcopy; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4079: checking for $ac_word" >&5 +echo "configure:4055: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4105,7 +4084,7 @@ if test -z "$ac_cv_prog_OBJCOPY" ; then # Extract the first word of "objcopy", so it can be a program name with args. set dummy objcopy; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4112: checking for $ac_word" >&5 +echo "configure:4088: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJCOPY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4144,7 +4123,7 @@ fi # Extract the first word of "${ncn_tool_prefix}objdump", so it can be a program name with args. set dummy ${ncn_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4151: checking for $ac_word" >&5 +echo "configure:4127: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4177,7 +4156,7 @@ if test -z "$ac_cv_prog_OBJDUMP" ; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4184: checking for $ac_word" >&5 +echo "configure:4160: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4223,7 +4202,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}ar", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4230: checking for $ac_word" >&5 +echo "configure:4206: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4256,7 +4235,7 @@ if test -z "$ac_cv_prog_CONFIGURED_AR_FOR_TARGET" ; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4263: checking for $ac_word" >&5 +echo "configure:4239: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4295,7 +4274,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}as", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4302: checking for $ac_word" >&5 +echo "configure:4278: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4328,7 +4307,7 @@ if test -z "$ac_cv_prog_CONFIGURED_AS_FOR_TARGET" ; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4335: checking for $ac_word" >&5 +echo "configure:4311: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4367,7 +4346,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4374: checking for $ac_word" >&5 +echo "configure:4350: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4400,7 +4379,7 @@ if test -z "$ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET" ; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4407: checking for $ac_word" >&5 +echo "configure:4383: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4439,7 +4418,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}ld", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4446: checking for $ac_word" >&5 +echo "configure:4422: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4472,7 +4451,7 @@ if test -z "$ac_cv_prog_CONFIGURED_LD_FOR_TARGET" ; then # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4479: checking for $ac_word" >&5 +echo "configure:4455: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4511,7 +4490,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}nm", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4518: checking for $ac_word" >&5 +echo "configure:4494: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4544,7 +4523,7 @@ if test -z "$ac_cv_prog_CONFIGURED_NM_FOR_TARGET" ; then # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4551: checking for $ac_word" >&5 +echo "configure:4527: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4583,7 +4562,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4590: checking for $ac_word" >&5 +echo "configure:4566: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4616,7 +4595,7 @@ if test -z "$ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET" ; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4623: checking for $ac_word" >&5 +echo "configure:4599: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4655,7 +4634,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}windres", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4662: checking for $ac_word" >&5 +echo "configure:4638: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4688,7 +4667,7 @@ if test -z "$ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET" ; then # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4695: checking for $ac_word" >&5 +echo "configure:4671: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4773,7 +4752,7 @@ RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target} NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target} echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:4780: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:4756: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -4820,7 +4799,7 @@ esac # gcc for stageN-gcc and stagePREV-gcc for stage(N-1). In case this is not # possible, however, we can resort to mv. echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6 -echo "configure:4827: checking if symbolic links between directories work" >&5 +echo "configure:4803: checking if symbolic links between directories work" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4934,15 +4913,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then we branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +cat >confdef2opt.sed <<\_ACEOF +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +t quote +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +t quote +d +: quote +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,\[,\\&,g +s,\],\\&,g +s,\$,$$,g +p +_ACEOF +# We use echo to avoid assuming a particular line-breaking character. +# The extra dot is to prevent the shell from consuming trailing +# line-breaks from the sub-command output. A line-break within +# single-quotes doesn't work because, if this script is created in a +# platform that uses two characters for line-breaks (e.g., DOS), tr +# would break. +ac_LF_and_DOT=`echo; echo .` +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +rm -f confdef2opt.sed # Without the "./", some shells look in PATH for config.status. diff --git a/configure.in b/configure.in index 3354db1..9c32e12 100644 --- a/configure.in +++ b/configure.in @@ -136,7 +136,7 @@ build_tools="build-texinfo build-byacc build-flex build-bison build-m4 build-fix # these libraries are used by various programs built for the host environment # -host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libbanshee libcpp" +host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp" # these tools are built for the host environment # Note, the powerpc-eabi build depends on sim occurring before gdb in order to @@ -308,17 +308,6 @@ case "${host}" in ;; esac -AC_ARG_WITH(libbanshee, -[ --without-libbanshee Don't build with libbanshee]) -case ${with_libbanshee} in - no) - noconfigdirs="$noconfigdirs libbanshee" ;; - yes|"") - with_libbanshee=yes - ;; - *) - AC_MSG_ERROR([--with-libbanshee can only be empty, "yes" or "no" (empty defaults to "yes".]) -esac AC_ARG_ENABLE(libada, [ --enable-libada Builds libada directory], @@ -1526,10 +1515,6 @@ if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target- extra_host_args="$extra_host_args --with-newlib" fi -if test x${with_libbanshee} = xyes && echo " ${configdirs} " | grep " libbanshee " >/dev/null 2>&1; then - extra_host_args="$extra_host_args --with-libbanshee" -fi - # Default to using --with-stabs for certain targets. if test x${with_stabs} = x ; then case "${target}" in |