This commit was manufactured by cvs2svn to create tag 'sid-sid-snapshot-20080601

snapshot-20080601'.

Sprout from msnyder-reverse-20080609-branch 2008-06-09 22:20:47 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'msnyder-'
Cherrypick from master 2008-05-21 14:50:07 UTC Nick Clifton <nickc@redhat.com> '        * reloc-macros.h: Add a comment about the use of the':
    ChangeLog
    Makefile.def
    Makefile.in
    Makefile.tpl
    config/ChangeLog
    config/mh-mingw
    include/ChangeLog
    include/bfdlink.h
    include/elf/ChangeLog
    include/elf/common.h
    include/elf/sh.h
Delete:
    djunpack.bat
    texinfo/texinfo.tex

1 files changed, 7 insertions, 14 deletions

diff --git a/Makefile.in b/Makefile.in
index 1bd87fd52..16b94cfee 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -144,12 +144,6 @@ BUILD_EXPORTS = \
 	WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \
 	WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC;
 
-# These variables must be set on the make command line for directories
-# built for the build system to override those in BASE_FLAGS_TO_PASSS.
-EXTRA_BUILD_FLAGS = \
-	CFLAGS="$(CFLAGS_FOR_BUILD)" \
-	LDFLAGS="$(LDFLAGS_FOR_BUILD)"
-
 # This is the list of directories to built for the host system.
 SUBDIRS = @configdirs@
 # This is set by the configure script to the arguments to use when configuring
@@ -505,7 +499,6 @@ BASE_FLAGS_TO_PASS = \
 	"INSTALL_DATA=$(INSTALL_DATA)" \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
 	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
-	"LDFLAGS_FOR_BUILD=$(LDFLAGS_FOR_BUILD)" \
 	"LEX=$(LEX)" \
 	"M4=$(M4)" \
 	"MAKE=$(MAKE)" \
@@ -2769,7 +2762,7 @@ all-build-libiberty: configure-build-libiberty
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	(cd $(BUILD_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
 		$(TARGET-build-libiberty))
 @endif build-libiberty
 
@@ -2825,7 +2818,7 @@ all-build-bison: configure-build-bison
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	(cd $(BUILD_SUBDIR)/bison && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
 		$(TARGET-build-bison))
 @endif build-bison
 
@@ -2881,7 +2874,7 @@ all-build-byacc: configure-build-byacc
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	(cd $(BUILD_SUBDIR)/byacc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
 		$(TARGET-build-byacc))
 @endif build-byacc
 
@@ -2937,7 +2930,7 @@ all-build-flex: configure-build-flex
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	(cd $(BUILD_SUBDIR)/flex && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
 		$(TARGET-build-flex))
 @endif build-flex
 
@@ -2993,7 +2986,7 @@ all-build-m4: configure-build-m4
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	(cd $(BUILD_SUBDIR)/m4 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
 		$(TARGET-build-m4))
 @endif build-m4
 
@@ -3049,7 +3042,7 @@ all-build-texinfo: configure-build-texinfo
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	(cd $(BUILD_SUBDIR)/texinfo && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
 		$(TARGET-build-texinfo))
 @endif build-texinfo
 
@@ -3105,7 +3098,7 @@ all-build-fixincludes: configure-build-fixincludes
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	(cd $(BUILD_SUBDIR)/fixincludes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
 		$(TARGET-build-fixincludes))
 @endif build-fixincludes