* ld-scripts/script.t: Put .pr in .text, and .rw in .data, for

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

diff --git a/Makefile.in b/Makefile.in
index d963ec630b60bc893afa3c5c34ba0f32a65f4bc2..be05ea89c6d1ce52555ce743213b438698134599 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -122,9 +122,6 @@ RUNTEST = `if [ -f $${srcroot}/dejagnu/runtest ] ; \
        else echo runtest ; 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)
@@ -204,6 +201,17 @@ AS_FOR_TARGET = ` \
     fi; \
   fi`
 
+LD_FOR_TARGET = ` \
+  if [ -f $$r/ld/ld.new ] ; then \
+    echo $$r/ld/ld.new ; \
+  else \
+    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+      echo $(LD); \
+    else \
+       t='$(program_transform_name)'; echo ld | sed -e 's/x/x/' $$t ; \
+    fi; \
+  fi`
+
 DLLTOOL_FOR_TARGET = ` \
   if [ -f $$r/binutils/dlltool ] ; then \
     echo $$r/binutils/dlltool ; \
@@ -279,6 +287,7 @@ BASE_FLAGS_TO_PASS = \
        "INSTALL_XFORM=$(INSTALL_XFORM)" \
        "LDFLAGS=$(LDFLAGS)" \
        "LEX=$(LEX)" \
+       "LD_FOR_TARGET=$(LD_FOR_TARGET)" \
        "LIBCFLAGS=$(LIBCFLAGS)" \
        "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
        "LIBCXXFLAGS=$(LIBCXXFLAGS)" \
@@ -313,10 +322,15 @@ FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
 
 # Flags that are concerned with the location of the X11 include files
 # and library files
+#
+# NOTE: until the top-level is getting the values via autoconf, it only
+# causes problems to have this top-level Makefile overriding the autoconf-set
+# values in child directories.  Only variables that don't conflict with
+# autoconf'ed ones should be passed by X11_FLAGS_TO_PASS for now.
+#
 X11_FLAGS_TO_PASS = \
-       "X11_INCLUDE_FLAGS=$(X11_INCLUDE_FLAGS)" \
-       "X11_LIB_FLAGS=$(X11_LIB_FLAGS)" \
-       "X11_LIB=$(X11_LIB)"
+       'X11_EXTRA_CFLAGS=$(X11_EXTRA_CFLAGS)' \
+       'X11_EXTRA_LIBS=$(X11_EXTRA_LIBS)'
 
 # Flags to pass down to makes which are built with the target environment.
 # The double $ decreases the length of the command line; the variables
@@ -330,6 +344,7 @@ EXTRA_TARGET_FLAGS = \
        'CXX=$$(CXX_FOR_TARGET)' \
        'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
        'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
+       'LD=$$(LD_FOR_TARGET)' \
        'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
        'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
        'NM=$$(NM_FOR_TARGET)' \
@@ -830,6 +845,7 @@ $(CONFIGURE_TARGET_MODULES):
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+           LD="$(LD_FOR_TARGET)"; export LD; \
            NM="$(NM_FOR_TARGET)"; export NM; \
            RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
            cd $${dir}; \
@@ -1113,12 +1129,8 @@ ETC_SUPPORT_PFX=configure.info standards.info cfg-paper.info
 # When you use `make setup-dirs' or `make taz' you should always redefine
 # this macro.
 SUPPORT_FILES = list-of-support-files-for-tool-in-question
-# Directories that might want `make diststuff' run.
-DISTSTUFFDIRS= ld gprof gdb libg++ binutils gnats gas
 # Files where "byacc" (Cygnus version) should be changed to "bison -y" (FSF).
 DISTBISONFILES= binutils/Makefile.in gas/Makefile.in gdb/Makefile.in
-# Directories where "info" should be built.
-DISTDOCDIRS= ld gprof binutils gas bfd libg++ libio gdb gnats send-pr etc
 
 .PHONY: taz
 
@@ -1143,25 +1155,16 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
        @if [ -f .Sanitize ] ; then echo "RUN Sanitize FIRST!" ; false ; fi ;
        $(end-sanitize-Sanitize)
        ./configure sun4
-       # Doc files don't change; include them in distribution.
-       for f in $(DISTDOCDIRS) ; do \
-         if [ -r $$f/Makefile ]; then \
-           (cd $$f ; $(MAKE) info) || exit 1 ; \
-         else true ; fi ; \
-       done
-       # Make links, and run "make diststuff" when needed.
-       # The `echo' for setting `p' is to convert all whitespace to spaces.
-       # Then the `case' further below should tell whether $$d is in
-       # DISTSTUFFDIRS.
+       # Make links, and run "make diststuff" or "make info" when needed.
        rm -rf proto-toplev ; mkdir proto-toplev
        set -e ; dirs="$(TOOL) $(DEVO_SUPPORT) $(SUPPORT_FILES)" ; \
-       p=" `echo $(DISTSTUFFDIRS)` " ; \
        for d in $$dirs ; do \
          if [ -d $$d ]; then \
-           case " $$p " in \
-           *" $$d "*)  \
-               (cd $$d ; $(MAKE) diststuff ) || exit 1  ;; \
-           esac ; \
+           if grep '^diststuff:' $$d/Makefile >/dev/null ; then \
+               (cd $$d ; $(MAKE) diststuff ) || exit 1  ; \
+           elif grep '^info:' $$d/Makefile >/dev/null ; then \
+               (cd $$d ; $(MAKE) info ) || exit 1  ; \
+           fi ; \
            if [ -d $$d/proto-$$d.dir ]; then \
              ln -s ../$$d/proto-$$d.dir proto-toplev/$$d ; \
            else \
@@ -1256,8 +1259,7 @@ newlib.tar.gz: $(DIST_SUPPORT) $(NEWLIB_SUPPORT_DIRS) newlib
        cd newlib ; make distclean
        $(MAKE) -f Makefile.in taz TOOL=newlib \
                SUPPORT_FILES="$(NEWLIB_SUPPORT_DIRS)" \
-               DEVO_SUPPORT="$(DEVO_SUPPORT) COPYING.NEWLIB" \
-               DISTDOCDIRS="$(DISTDOCDIRS) newlib"
+               DEVO_SUPPORT="$(DEVO_SUPPORT) COPYING.NEWLIB" newlib
 
 .NOEXPORT:
 MAKEOVERRIDES=