diff options
author | DJ Delorie <dj@delorie.com> | 2004-12-08 18:55:40 +0000 |
---|---|---|
committer | DJ Delorie <dj@delorie.com> | 2004-12-08 18:55:40 +0000 |
commit | fc8990c77837393198ed44ced674292e2994c94b (patch) | |
tree | 6a3d50f987d93f97197a67a422c43ba3e740388c /libiberty | |
parent | c894d0d38c3c4156654b9909c3842b3fd6b46c3b (diff) | |
download | gdb-fc8990c77837393198ed44ced674292e2994c94b.tar.gz |
merge from gcc
Diffstat (limited to 'libiberty')
-rw-r--r-- | libiberty/ChangeLog | 4 | ||||
-rw-r--r-- | libiberty/Makefile.in | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 67c6ccb36a9..378ee0af0d3 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,7 +1,3 @@ -2004-12-08 Ben Elliston <bje@au.ibm.com> - - * Makefile.in (.NOEXPORT): Move above the autogenerated line. - 2004-12-07 DJ Delorie <dj@redhat.com> * splay-tree.c (splay_tree_delete_helper): Redesign the logic so diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index e09aaa110fa..ffa4ba51d67 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: |