summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Jacobowitz <dan@debian.org>2005-06-12 18:46:26 +0000
committerDaniel Jacobowitz <dan@debian.org>2005-06-12 18:46:26 +0000
commitff8edc51e50b0436efc2a3eb34437e05d6f296ce (patch)
treed9a92e9a15be801fdd3f7015f37eafbde8ab788a
parentad33ff9f483a957cf6a68db5cf4be3c28a963532 (diff)
downloadgdb-ff8edc51e50b0436efc2a3eb34437e05d6f296ce.tar.gz
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.
-rw-r--r--bfd/doc/ChangeLog12
-rw-r--r--bfd/doc/Makefile.am5
-rw-r--r--bfd/doc/Makefile.in5
3 files changed, 20 insertions, 2 deletions
diff --git a/bfd/doc/ChangeLog b/bfd/doc/ChangeLog
index 943d9bd09f8..e0c86c42afd 100644
--- 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 4e36b5135d0..2a7f792b021 100644
--- 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 8b6d02b144f..8df56ace07e 100644
--- 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