bfd/doc/

	Backport from mainline:
	2005-05-05  H.J. Lu  <hongjiu.lu@intel.com>
	* Makefile.am (INCLUDES): Remove -D_GNU_SOURCE.
	* Makefile.in: Regenerate.

	2005-04-21  H.J. Lu  <hongjiu.lu@intel.com>
	* Makefile.am (INCLUDES): New. Add -D_GNU_SOURCE.
	(chew.o): Use it.
	* Makefile.in: Regenerate.

diff --git a/bfd/doc/ChangeLog b/bfd/doc/ChangeLog
index 943d9bd09f83019f627b8aabbddf5973419b2912..e0c86c42afdabccb8960b87e14d81df4bb4f1382 100644 (file)
--- a/bfd/doc/ChangeLog
+++ b/bfd/doc/ChangeLog
@@ -1,3 +1,15 @@
+2005-06-12  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       Backport from mainline:
+       2005-05-05  H.J. Lu  <hongjiu.lu@intel.com>
+       * Makefile.am (INCLUDES): Remove -D_GNU_SOURCE.
+       * Makefile.in: Regenerate.
+
+       2005-04-21  H.J. Lu  <hongjiu.lu@intel.com>
+       * Makefile.am (INCLUDES): New. Add -D_GNU_SOURCE.
+       (chew.o): Use it.
+       * Makefile.in: Regenerate.
+
 2005-05-09  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * Makefile.am: Use a temporary file to build chew.

diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am
index 4e36b5135d06daa047f57abc9778566546f20710..2a7f792b0215b406aeb4a8c25816b103c136b8db 100644 (file)
--- a/bfd/doc/Makefile.am
+++ b/bfd/doc/Makefile.am
@@ -54,6 +54,9 @@ info_TEXINFOS = bfd.texinfo
 
 MKDOC = chew$(EXEEXT_FOR_BUILD)
 
+INCLUDES = -I.. -I$(srcdir)/.. -I$(srcdir)/../../include \
+       -I$(srcdir)/../../intl -I../../intl
+
 $(MKDOC): $(srcdir)/chew.c
        $(CC_FOR_BUILD) -o chew.$$$$ $(srcdir)/chew.c \
          $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(H_CFLAGS) \
@@ -61,7 +64,7 @@ $(MKDOC): $(srcdir)/chew.c
        $(SHELL) $(srcdir)/../../move-if-change chew.$$$$ $(MKDOC)
 
 chew.o: chew.c
-       $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/chew.c
+       $(CC_FOR_BUILD) -c $(INCLUDES) $(H_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/chew.c
 
 protos: libbfd.h libcoff.h bfd.h
 

diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in
index 8b6d02b144fe3467d57a8d465d73ca68bc445ace..8df56ace07e4610c1ffddf3037b9ade74b89fbd1 100644 (file)
--- a/bfd/doc/Makefile.in
+++ b/bfd/doc/Makefile.in
@@ -261,6 +261,9 @@ SRCIPROT = $(srcdir)/../cache.c $(srcdir)/../libbfd.c \
 TEXIDIR = $(srcdir)/../../texinfo/fsf
 info_TEXINFOS = bfd.texinfo
 MKDOC = chew$(EXEEXT_FOR_BUILD)
+INCLUDES = -I.. -I$(srcdir)/.. -I$(srcdir)/../../include \
+       -I$(srcdir)/../../intl -I../../intl
+
 LIBBFD_H_DEP = \
        $(srcdir)/../libbfd-in.h        \
        $(srcdir)/../init.c             \
@@ -589,7 +592,7 @@ $(MKDOC): $(srcdir)/chew.c
        $(SHELL) $(srcdir)/../../move-if-change chew.$$$$ $(MKDOC)
 
 chew.o: chew.c
-       $(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/chew.c
+       $(CC_FOR_BUILD) -c $(INCLUDES) $(H_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/chew.c
 
 protos: libbfd.h libcoff.h bfd.h