From abe84df79712306f5edbbea4b5e35dc63920fb42 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Wed, 8 Dec 2004 18:55:40 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 4 ---- libiberty/Makefile.in | 7 +++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 67c6ccb..378ee0a 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,7 +1,3 @@ -2004-12-08 Ben Elliston - - * Makefile.in (.NOEXPORT): Move above the autogenerated line. - 2004-12-07 DJ Delorie * splay-tree.c (splay_tree_delete_helper): Redesign the logic so diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index e09aaa1..ffa4ba5 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -413,10 +413,6 @@ maintainer-clean-subdir: config.h $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS): stamp-picdir $(CONFIGURED_OFILES): stamp-picdir -# Don't export variables to the environment, in order to not confuse -# configure. -.NOEXPORT: - # The dependencies in the remainder of this file are automatically # generated by "make maint-deps". Manual edits will be lost. @@ -1061,3 +1057,6 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/xstrerror.c $(OUTPUT_OPTION) +# Don't export variables to the environment, in order to not confuse +# configure. +.NOEXPORT: -- 2.7.4