* Makefile.in (DEMANGLING_STYLE): New define to set default

[deliverable/binutils-gdb.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index b70c763c6face901b299f72449ed49607dd5a4b6..b259f91e71aae6c8816bba1c79ced3a2757e9022 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -52,9 +52,9 @@ AR_FLAGS = qc
 CFLAGS = -g
 RANLIB = ranlib
 
-BISON = `if [ -d $${rootme}/bison ] ; \
-       then echo $${rootme}/bison/bison -L $${rootme}/bison/ -y ; \
-       else echo bison -y ; fi`
+BISON = `if [ -d $${rootme}/byacc ] ; \
+       then echo $${rootme}/byacc/byacc ; \
+       else echo byacc ; fi`
 
 LEX = `if [ -d $${rootme}/flex ] ; \
        then echo $${rootme}/flex/flex -S$${rootme}/flex/flex.skel ; \
@@ -73,6 +73,13 @@ INSTALL_TARGET = install.all
 ### for debugging
 #GCCVERBOSE=-v
 
+GXX = `if [ -d $${rootme}/gcc ] ; \
+       then echo $${rootme}/gcc/gcc -B$${rootme}/gcc/ ; \
+       else echo gcc ; fi`
+
+XTRAFLAGS = `if [ -d $${rootme}/gcc ] ; \
+       then echo -I$${rootme}/gcc/include ; \
+       else echo ; fi`
 
 #### host and target specific makefile fragments come in here.
 ###
@@ -101,16 +108,14 @@ FLAGS_TO_PASS = \
 all:   $(ALL)
 
 info:  cfg-paper.info configure.info standards.info
-       @rootme=`pwd` ; export rootme ; $(MAKE) subdir_do DO=info "DODIRS=$(SUBDIRS)" "MAKEINFO=$(MAKEINFO)"
+       @rootme=`pwd` ; export rootme ; $(MAKE) subdir_do DO=info "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS)
 
 # Note libg++ has to be handled specially (we can't compile it with CC=cc).
 check:
        @rootme=`pwd` ; export rootme ; $(MAKE) subdir_do DO=check \
-       "DODIRS=`echo $(SUBDIRS) | sed -e \"s/libg\+\+//\"" \
-       "MAKEINFO=$(MAKEINFO)"
+         "DODIRS=`echo $(SUBDIRS) | sed -e \"s/libg\+\+//\"" $(FLAGS_TO_PASS)
        @rootme=`pwd` ; export rootme ; $(MAKE) subdir_do DO=check \
-       "DODIRS=libg++" "CC=${GXX}" "XTRAFLAGS=${XTRAFLAGS}" \
-       "MAKEINFO=$(MAKEINFO)"
+         "DODIRS=libg++" $(FLAGS_TO_PASS) "CC=${GXX}" "XTRAFLAGS=${XTRAFLAGS}"
 
 clean-info:
        @$(MAKE) subdir_do DO=clean-info "DODIRS=$(SUBDIRS)"
@@ -143,7 +148,7 @@ all.normal: all-autoconf all-libiberty all-mmalloc all-texinfo \
        all-patch all-emacs all-ispell \
        all-newlib all-gprof all-send_pr
 
-all.cross: all-libiberty all-mmalloc all-gas all-bison all-ld \
+all.cross: all-libiberty all-mmalloc all-gas all-byacc all-ld \
        all-bfd all-libgcc all-readline all-gdb
 #      $(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS) $(OTHERS)"
 
@@ -163,8 +168,8 @@ install: $(INSTALL_TARGET) $(srcdir)/configure.man
        $(INSTALL_DATA) $(srcdir)/configure.man $(man1dir)/configure.1
 
 
-install.all: install-dirs install-autoconf install-libiberty \
-       install-mmalloc install-texinfo install-bfd install-binutils \
+install.all: install-dirs install-autoconf install-texinfo \
+       install-mmalloc install-libiberty install-bfd install-binutils \
        install-bison install-byacc install-flex install-ld \
        install-gas install-gcc install-gprof install-libgcc \
        install-readline install-glob install-gdb install-make \
@@ -175,7 +180,7 @@ install.all: install-dirs install-autoconf install-libiberty \
 install.cross: install-dirs install-libiberty install-mmalloc \
         install-binutils install-bison install-byacc install-flex \
         install-ld install-gas install-libgcc install-readline \
-        install-glob install-gdb install-mmalloc install-gprof
+        install-glob install-gdb install-mmalloc install-gprof install-newlib install-gcc
 
 ### autoconf
 all-autoconf: force
@@ -369,7 +374,7 @@ install-newlib: force
        @if [ -d ./newlib ] ; then \
                rootme=`pwd` ; export rootme ; \
                (cd ./newlib; \
-               $(MAKE) $(FLAGS_TO_PASS) install) ; \
+               $(MAKE)  install) ; \
        else \
                true ; \
        fi
@@ -377,6 +382,7 @@ install-newlib: force
 ### gprof
 all-gprof: all-libiberty all-bfd
        @if [ -d ./gprof ] ; then \
+               rootme=`pwd` ; export rootme ; \
                (cd ./gprof; \
                $(MAKE) $(FLAGS_TO_PASS) all) ; \
        else \
@@ -384,16 +390,18 @@ all-gprof: all-libiberty all-bfd
        fi
 
 clean-gprof: force
-       @if [ -d $(unsubdir)/gprof ] ; then \
-               (cd $(unsubdir)/gprof$(subdir); \
+       @if [ -d ./gprof ] ; then \
+               rootme=`pwd` ; export rootme ; \
+               (cd ./gprof; \
                $(MAKE) $(FLAGS_TO_PASS) clean) ; \
        else \
                true ; \
        fi
 
 install-gprof: force
-       @if [ -d $(unsubdir)/gprof ] ; then \
-               (cd $(unsubdir)/gprof$(subdir); \
+       @if [ -d ./gprof ] ; then \
+               rootme=`pwd` ; export rootme ; \
+               (cd ./gprof; \
                $(MAKE) $(FLAGS_TO_PASS) install) ; \
        else \
                true ; \
@@ -483,7 +491,7 @@ install-flex: force
                true ; \
        fi
 ### gcc
-all-gcc: all-libiberty all-bison
+all-gcc: all-libiberty all-byacc
        @if [ -d ./gcc ] ; then \
                rootme=`pwd` ; export rootme ; \
                (cd ./gcc; \
@@ -595,7 +603,7 @@ install-gas: force
        fi
 
 ### ld
-all-ld: all-libiberty all-bfd all-bison all-flex
+all-ld: all-libiberty all-bfd all-byacc all-flex
        @if [ -d ./ld ] ; then \
                rootme=`pwd` ; export rootme ; \
                (cd ./ld; \
@@ -673,7 +681,7 @@ install-libgcc: force
        fi
 
 ### gdb
-all-gdb: all-bfd all-libiberty all-mmalloc all-readline all-glob all-bison
+all-gdb: all-bfd all-libiberty all-mmalloc all-readline all-glob all-byacc
        @if [ -d ./gdb ] ; then \
                rootme=`pwd` ; export rootme ; \
                (cd ./gdb; \
@@ -955,30 +963,12 @@ install-send_pr: force
        fi
 
 ### libg++
-GXX = `if [ -d $${rootme}/gcc ] ; \
-       then echo $${rootme}/gcc/gcc -B$${rootme}/gcc/ ; \
-       else echo gcc ; fi`
-
-XTRAFLAGS = `if [ -d $${rootme}/gcc ] ; \
-       then echo -I$${rootme}/gcc/include ; \
-       else echo ; fi`
 
 all-libg++: all-gas all-ld all-gcc
        @if [ -d ./libg++ ] ; then \
                rootme=`pwd` ; export rootme ; \
                (cd ./libg++; \
-               $(MAKE) \
-                       "AR=$(AR)" \
-                       "AR_FLAGS=$(AR_FLAGS)" \
-                       "CC=${GXX}" \
-                       "CFLAGS=$(CFLAGS)" \
-                       "XTRAFLAGS=${XTRAFLAGS}" \
-                       "RANLIB=$(RANLIB)" \
-                       "LOADLIBES=$(LOADLIBES)" \
-                       "LDFLAGS=$(LDFLAGS)" \
-                       "BISON=$(BISON)" \
-                       "MAKEINFO=$(MAKEINFO)" \
-                       all) ; \
+               $(MAKE) $(FLAGS_TO_PASS) "CC=${GXX}" all) ; \
        else \
                true ; \
        fi
@@ -987,17 +977,7 @@ clean-libg++: force
        @if [ -d ./libg++ ] ; then \
                rootme=`pwd` ; export rootme ; \
                (cd ./libg++; \
-               $(MAKE) \
-                       "AR=$(AR)" \
-                       "AR_FLAGS=$(AR_FLAGS)" \
-                       "CC=$(CC)" \
-                       "CFLAGS=$(CFLAGS)" \
-                       "RANLIB=$(RANLIB)" \
-                       "LOADLIBES=$(LOADLIBES)" \
-                       "LDFLAGS=$(LDFLAGS)" \
-                       "BISON=$(BISON)" \
-                       "MAKEINFO=$(MAKEINFO)" \
-                       clean) ; \
+               $(MAKE) $(FLAGS_TO_PASS) "CC=${GXX}" clean) ; \
        else \
                true ; \
        fi
@@ -1006,20 +986,7 @@ install-libg++: force
        @if [ -d ./libg++ ] ; then \
                rootme=`pwd` ; export rootme ; \
                (cd ./libg++; \
-               $(MAKE) \
-                       "AR=$(AR)" \
-                       "AR_FLAGS=$(AR_FLAGS)" \
-                       "CC=$(CC)" \
-                       "CFLAGS=$(CFLAGS)" \
-                       "RANLIB=$(RANLIB)" \
-                       "LOADLIBES=$(LOADLIBES)" \
-                       "LDFLAGS=$(LDFLAGS)" \
-                       "BISON=$(BISON)" \
-                       "MAKEINFO=$(MAKEINFO)" \
-                       "INSTALL=$(INSTALL)" \
-                       "INSTALL_DATA=$(INSTALL_DATA)" \
-                       "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
-                       install) ; \
+               $(MAKE) $(FLAGS_TO_PASS) "CC=${GXX}" install) ; \
        else \
                true ; \
        fi
@@ -1117,7 +1084,7 @@ Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
 # Build GDB distributions that contain BFD, Include, Libiberty, Readline, etc
 
 DEVO_SUPPORT= README cfg-paper.texi Makefile.in configure configure.in \
-       config.sub config configure.man
+       config.sub config configure.man move-if-change
 GDB_SUPPORT_DIRS= bfd include libiberty mmalloc readline glob
 GDB_SUPPORT_FILES= $(GDB_SUPPORT_DIRS) texinfo/fsf/texinfo.tex
 
@@ -1154,13 +1121,13 @@ make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/fsf/texinfo.tex
        sed '/^configdirs=/s/texinfo //' <configure.in >proto-toplev/configure.in
        # Take out glob from buildable dirs
        rm proto-toplev/Makefile.in
-       sed '/^SUBDIRS =/s/glob //' <Makefile.in >proto-toplev/Makefile.in
-       # Take out texinfo from buildable dirs
-       cp proto-toplev/Makefile.in temp.$$
-       sed '/^all\.normal: /s/\all-texinfo //' <temp.$$ >temp1.$$
-       sed '/^clean: /s/clean-texinfo //' <temp1.$$ >temp.$$
-       sed '/^install\.all: /s/install-texinfo //' <temp.$$ >proto-toplev/Makefile.in
-       rm temp.$$ temp1.$$
+
+       sed -e '/^SUBDIRS =/s/glob //' \
+           -e '/^all\.normal: /s/\all-texinfo //' \
+           -e '/^clean: /s/clean-texinfo //' \
+           -e '/^install\.all: /s/install-texinfo //' \
+       <Makefile.in >proto-toplev/Makefile.in
+
        mkdir proto-toplev/texinfo
        mkdir proto-toplev/texinfo/fsf
        ln -s ../../../texinfo/fsf/texinfo.tex proto-toplev/texinfo/fsf/