From 7dc54c36da5ce89b3147ca93a4d00ae7a23d8516 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Tue, 18 Aug 2009 21:48:05 +0000 Subject: [PATCH] 2009-08-18 Jeff Johnston * newlib.hin: Add comment regarding file being manually edited. * Makefile.am: Add no-op rule for newlib.hin. * Makefile.in: Regenerated. --- newlib/ChangeLog | 6 ++++++ newlib/Makefile.am | 1 + newlib/Makefile.in | 6 ++---- newlib/newlib.hin | 5 ++++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index b8a570f04..1397c4b06 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,9 @@ +2009-08-18 Jeff Johnston + + * newlib.hin: Add comment regarding file being manually edited. + * Makefile.am: Add no-op rule for newlib.hin. + * Makefile.in: Regenerated. + 2009-08-18 Jeff Johnston * acconfig.h: Add templates for _HAVE_LONG_DOUBLE and _LDBL_EQ_DBL. diff --git a/newlib/Makefile.am b/newlib/Makefile.am index 1740dae6e..6bd497402 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -187,6 +187,7 @@ crt1.o: $(CRT1_DIR)$(CRT1) $(CRT1_DIR)$(CRT1): ; @true +$(srcdir)/newlib.hin: all-recursive: stmp-targ-include diff --git a/newlib/Makefile.in b/newlib/Makefile.in index ef36ae9eb..d3a4a234a 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -459,10 +459,6 @@ newlib.h: stamp-h1 stamp-h1: $(srcdir)/newlib.hin $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status newlib.h -$(srcdir)/newlib.hin: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(top_srcdir)/acconfig.h - cd $(top_srcdir) && $(AUTOHEADER) - rm -f stamp-h1 - touch $@ distclean-hdr: -rm -f newlib.h stamp-h1 @@ -866,6 +862,8 @@ crt1.o: $(CRT1_DIR)$(CRT1) $(CRT1_DIR)$(CRT1): ; @true +$(srcdir)/newlib.hin: + all-recursive: stmp-targ-include # The targ-include directory just holds the includes files for the diff --git a/newlib/newlib.hin b/newlib/newlib.hin index 1db939a2c..1ac25178c 100644 --- a/newlib/newlib.hin +++ b/newlib/newlib.hin @@ -1,4 +1,7 @@ -/* newlib.hin. Generated from configure.in by autoheader. */ +/* newlib.hin. Manually edited from the output of autoheader to + remove all PACKAGE_ macros which will collide with any user + package using newlib header files and having its own package name, + version, etc... */ #ifndef __NEWLIB_H__ #define __NEWLIB_H__ 1