Stylistic Cleanups to Headings and Cross References to Avoid Undue

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

diff --git a/Makefile.in b/Makefile.in
index 106dc0f23b49e71a9a107e7a2e84b1d9bf560064..9c54d9edab97ccf82e029bd1ff46f248003d1dba 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,8 +53,8 @@ AS = as
 AR = ar
 AR_FLAGS = rc
 CC = cc
-$(start-sanitize-chill)
 CFLAGS = -g
+$(start-sanitize-chill)
 CHILLFLAGS = $(CFLAGS)
 CHILL_LIB = -lchill
 $(end-sanitize-chill)
@@ -76,6 +76,10 @@ MAKEINFO = `if [ -f $${rootme}/texinfo/C/makeinfo ] ; \
        then echo $${rootme}/texinfo/C/makeinfo ; \
        else echo makeinfo ; fi`
 
+
+# libraries that may need to be augmented on a system-by-system basis
+X11_LIB = -lX11
+
 # compilers to use to create programs which must be run in the build
 # environment.
 CC_FOR_BUILD = $(CC)
@@ -227,9 +231,11 @@ $(end-sanitize-chill)\
 
 # Flags that are concerned with the location of the X11 include files
 # and library files
+
 X11_FLAGS_TO_PASS = \
        "X11_INCLUDE_FLAGS=$(X11_INCLUDE_FLAGS)" \
-       "X11_LIB_FLAGS=$(X11_LIB_FLAGS)"
+       "X11_LIB_FLAGS=$(X11_LIB_FLAGS)" \
+       "X11_LIB=$(X11_LIB)"
 
 # Flags to pass down to makes which are built with the target
 # environment (e.g. libg++, xiberty, newlib).  -- keep these in alpha order please
@@ -406,15 +412,25 @@ install-no-fixedincludes: install-dirs gcc-no-fixedincludes \
        install-fileutils install-find install-gawk install-m4 install-sed install-shellutils \
        install-textutils install-time install-wdiff
 
+#
+# Install the gcc headers files, but not the fixed include files,
+# which we are not allowed to distribute.  This rule is very dependent
+# on the workings of the gcc Makefile.in.
+#
 gcc-no-fixedincludes:
-       @if [ -f ./gcc/Makefile ] ; then \
-               rootme=`pwd` ; export rootme ; \
-               (cd ./gcc; \
-               $(MAKE) $(FLAGS_TO_PASS) install install-man \
-                       "INSTALL_HEADERS=install-common-headers install-float-h install-limits-h") ; \
-       else \
-               true ; \
-       fi
+       @if [ -f ./gcc/Makefile ]; then \
+         rm -rf gcc/tmp-include; \
+         mv gcc/include gcc/tmp-include 2>/dev/null; \
+         mkdir gcc/include; \
+         touch gcc/stmp-fixincludes; \
+         rm -f gcc/stmp-headers; \
+         rootme=`pwd`; export rootme; \
+         srcroot=`cd $(srcdir); pwd` ; export srcroot; \
+         (cd ./gcc; \
+          $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
+         rm -rf gcc/include; \
+         mv gcc/tmp-include gcc/include 2>/dev/null; \
+       else true; fi
 
 install.cross: install-dirs install-libiberty install-mmalloc \
         install-binutils install-opcodes install-byacc install-flex \
@@ -714,7 +730,7 @@ install-flex: force
                true ; \
        fi
 ### gcc
-all-gcc: all-libiberty all-byacc all-binutils
+all-gcc: all-libiberty all-byacc all-binutils all-gas
        @if [ -f ./gcc/Makefile ] ; then \
                rootme=`pwd` ; export rootme ; \
                srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
@@ -1439,7 +1455,7 @@ Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
 # Build GDB distributions that contain BFD, Include, Libiberty, Readline, etc
 
 DEVO_SUPPORT= README Makefile.in configure configure.in \
-       config.sub config etc move-if-change \
+       config.guess config.sub config etc move-if-change \
        COPYING.LIB
 GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline glob
 GDB_SUPPORT_FILES= $(GDB_SUPPORT_DIRS)
@@ -1454,7 +1470,7 @@ gdb.tar.Z: setup-dirs
        (cd gdb; $(MAKE) -f Makefile.in make-proto-gdb.dir)
        $(MAKE) $(MFLAGS) -f Makefile.in make-gdb.tar.Z
 
-make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/fsf/texinfo.tex
+make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/texinfo.tex
        rm -rf proto-toplev; mkdir proto-toplev
        ln -s ../gdb/proto-gdb.dir proto-toplev/gdb
        (cd proto-toplev; for i in $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS); do \
@@ -1467,21 +1483,23 @@ make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/fsf/texinfo.tex
        ln proto-toplev/gdb/COPYING proto-toplev/include/COPYING
        rm                          proto-toplev/readline/COPYING
        ln proto-toplev/gdb/COPYING proto-toplev/readline/COPYING
-       # Take out texinfo from configurable dirs
+
+       # Take out texinfo and glob from configurable dirs
        rm proto-toplev/configure.in
-       sed '/^configdirs=/s/texinfo //' <configure.in >proto-toplev/configure.in
-       # Take out glob from buildable dirs
-       rm proto-toplev/Makefile.in
+       sed -e '/^host_tools=/s/texinfo //' \
+           -e '/^host_libs=/s/glob //' \
+           <configure.in >proto-toplev/configure.in
 
-       sed -e '/^SUBDIRS =/s/glob //' \
-           -e '/^all\.normal: /s/\all-texinfo //' \
-           -e '/^clean: /s/clean-texinfo //' \
-           -e '/^install\.all: /s/install-texinfo //' \
+       # Take out texinfo from a few places; make simple BISON=bison line.
+       rm proto-toplev/Makefile.in
+       sed -e '/^all\.normal: /s/\all-texinfo //' \
+           -e '/^      install-texinfo /d' \
+           -e '\/^BISON =/,\/^$$/c\
+               BISON = bison' \
        <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/
+       ln -s ../../texinfo/texinfo.tex proto-toplev/texinfo/
        chmod og=u `find proto-toplev -print`
        (VER=`sed <gdb/Makefile.in -n 's/VERSION = //p'`; \
                echo "==> Making gdb-$$VER.tar.Z"; \