aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Jacobowitz <drow@false.org>2007-04-09 15:36:44 +0000
committerDaniel Jacobowitz <drow@false.org>2007-04-09 15:36:44 +0000
commit9150673628eae2af8140585b0164b1b667b70ce3 (patch)
treee7b7ea069fc4302329e75dc6ea08a345878541ad
parent6eef13555fc27f5e4e7a10e229883ae57f0560d9 (diff)
downloadgdb-9150673628eae2af8140585b0164b1b667b70ce3.zip
gdb-9150673628eae2af8140585b0164b1b667b70ce3.tar.gz
gdb-9150673628eae2af8140585b0164b1b667b70ce3.tar.bz2
* src-release (do-proto-toplev): Process the support directories before
the tool directory. * Makefile.am (bfdver.h): Do not generate doc/bfdver.texi. * doc/Makefile.am (DOCFILES): Add bfdver.texi. (bfdver.texi): New rule. * Makefile.in, doc/Makefile.in: Regenerated.
-rw-r--r--ChangeLog5
-rw-r--r--bfd/ChangeLog7
-rw-r--r--bfd/Makefile.am13
-rw-r--r--bfd/Makefile.in21
-rw-r--r--bfd/doc/Makefile.am14
-rw-r--r--bfd/doc/Makefile.in22
-rw-r--r--src-release2
7 files changed, 53 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a5e778..7554002 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-09 Daniel Jacobowitz <dan@codesourcery.com>
+
+ * src-release (do-proto-toplev): Process the support directories before
+ the tool directory.
+
2007-03-21 Richard Sandiford <richard@codesourcery.com>
* configure.ac (TOPLEVEL_CONFIGURE_ARGUMENTS): Fix m4 quoting
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index cfaa72f..7b8cf3e 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-09 Daniel Jacobowitz <dan@codesourcery.com>
+
+ * Makefile.am (bfdver.h): Do not generate doc/bfdver.texi.
+ * doc/Makefile.am (DOCFILES): Add bfdver.texi.
+ (bfdver.texi): New rule.
+ * Makefile.in, doc/Makefile.in: Regenerated.
+
2007-04-03 Matt Thomas <matt@netbsd.org>
* elf32-vax.c (elf_vax_relocate_section): Do not emit a PCREL reloc
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index e579733..165d6ae 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -964,8 +964,7 @@ CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib \
DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES)
bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in
- @-test -d doc || mkdir doc
- @echo "creating $@ and doc/bfdver.texi"
+ @echo "creating $@"
@bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
bfd_version_string="\"$(VERSION)\"" ;\
bfd_version_package="\"$(PKGVERSION)\"" ;\
@@ -978,15 +977,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in
-e "s,@bfd_version_string@,$$bfd_version_string," \
-e "s,@bfd_version_package@,$$bfd_version_package," \
-e "s,@report_bugs_to@,$$report_bugs_to," \
- < $(srcdir)/version.h > $@; \
- echo "@set VERSION $(VERSION)" > doc/bfdver.texi; \
- if [ -n "$(PKGVERSION)" ]; then \
- echo "@set VERSION_PACKAGE $(PKGVERSION)" >> doc/bfdver.texi; \
- fi; \
- echo "@set UPDATED `date '+%B %Y'`" >> doc/bfdver.texi; \
- if [ -n "$(REPORT_BUGS_TEXI)" ]; then \
- echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> doc/bfdver.texi; \
- fi
+ < $(srcdir)/version.h > $@
# What appears below is generated by a hacked mkdep using gcc -MM.
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 5eb55d5..fe061fa 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -142,6 +142,7 @@ GENCAT = @GENCAT@
GENINSRC_NEVER_FALSE = @GENINSRC_NEVER_FALSE@
GENINSRC_NEVER_TRUE = @GENINSRC_NEVER_TRUE@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
HDEFINES = @HDEFINES@
INCINTL = @INCINTL@
INSTALL_DATA = @INSTALL_DATA@
@@ -190,10 +191,7 @@ WARN_CFLAGS = @WARN_CFLAGS@
WIN32LDFLAGS = @WIN32LDFLAGS@
WIN32LIBADD = @WIN32LIBADD@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
all_backends = @all_backends@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -219,6 +217,7 @@ build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
@@ -232,12 +231,15 @@ infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@@ -1530,8 +1532,7 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES)
touch stmp-lcoff-h
bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in
- @-test -d doc || mkdir doc
- @echo "creating $@ and doc/bfdver.texi"
+ @echo "creating $@"
@bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
bfd_version_string="\"$(VERSION)\"" ;\
bfd_version_package="\"$(PKGVERSION)\"" ;\
@@ -1544,15 +1545,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in
-e "s,@bfd_version_string@,$$bfd_version_string," \
-e "s,@bfd_version_package@,$$bfd_version_package," \
-e "s,@report_bugs_to@,$$report_bugs_to," \
- < $(srcdir)/version.h > $@; \
- echo "@set VERSION $(VERSION)" > doc/bfdver.texi; \
- if [ -n "$(PKGVERSION)" ]; then \
- echo "@set VERSION_PACKAGE $(PKGVERSION)" >> doc/bfdver.texi; \
- fi; \
- echo "@set UPDATED `date '+%B %Y'`" >> doc/bfdver.texi; \
- if [ -n "$(REPORT_BUGS_TEXI)" ]; then \
- echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> doc/bfdver.texi; \
- fi
+ < $(srcdir)/version.h > $@
# What appears below is generated by a hacked mkdep using gcc -MM.
diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am
index 242e4ec..6ff434a 100644
--- a/bfd/doc/Makefile.am
+++ b/bfd/doc/Makefile.am
@@ -8,7 +8,8 @@ DOCFILES = aoutx.texi archive.texi archures.texi \
libbfd.texi bfdwin.texi bfdio.texi \
opncls.texi reloc.texi section.texi \
syms.texi targets.texi init.texi hash.texi linker.texi \
- mmo.texi
+ mmo.texi \
+ bfdver.texi
PROTOS = archive.p archures.p bfd.p \
core.p format.p \
@@ -273,6 +274,17 @@ bfd.h: $(BFD_H_DEP)
echo "#endif" >> $@
echo "#endif" >> $@
+bfdver.texi: $(srcdir)/Makefile.in
+ @echo "creating $@"; \
+ echo "@set VERSION $(VERSION)" > bfdver.texi; \
+ if [ -n "$(PKGVERSION)" ]; then \
+ echo "@set VERSION_PACKAGE $(PKGVERSION)" >> bfdver.texi; \
+ fi; \
+ echo "@set UPDATED `date '+%B %Y'`" >> bfdver.texi; \
+ if [ -n "$(REPORT_BUGS_TEXI)" ]; then \
+ echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> bfdver.texi; \
+ fi
+
noinst_TEXINFOS = bfdint.texi
MOSTLYCLEANFILES = $(MKDOC) *.o
diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in
index 0f41369..4469521 100644
--- a/bfd/doc/Makefile.in
+++ b/bfd/doc/Makefile.in
@@ -115,6 +115,7 @@ GENCAT = @GENCAT@
GENINSRC_NEVER_FALSE = @GENINSRC_NEVER_FALSE@
GENINSRC_NEVER_TRUE = @GENINSRC_NEVER_TRUE@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
HDEFINES = @HDEFINES@
INCINTL = @INCINTL@
INSTALL_DATA = @INSTALL_DATA@
@@ -163,10 +164,7 @@ WARN_CFLAGS = @WARN_CFLAGS@
WIN32LDFLAGS = @WIN32LDFLAGS@
WIN32LIBADD = @WIN32LIBADD@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
all_backends = @all_backends@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -192,6 +190,7 @@ build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
@@ -205,12 +204,15 @@ infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@@ -229,7 +231,8 @@ DOCFILES = aoutx.texi archive.texi archures.texi \
libbfd.texi bfdwin.texi bfdio.texi \
opncls.texi reloc.texi section.texi \
syms.texi targets.texi init.texi hash.texi linker.texi \
- mmo.texi
+ mmo.texi \
+ bfdver.texi
PROTOS = archive.p archures.p bfd.p \
core.p format.p \
@@ -765,6 +768,17 @@ bfd.h: $(BFD_H_DEP)
echo "#endif" >> $@
echo "#endif" >> $@
+bfdver.texi: $(srcdir)/Makefile.in
+ @echo "creating $@"; \
+ echo "@set VERSION $(VERSION)" > bfdver.texi; \
+ if [ -n "$(PKGVERSION)" ]; then \
+ echo "@set VERSION_PACKAGE $(PKGVERSION)" >> bfdver.texi; \
+ fi; \
+ echo "@set UPDATED `date '+%B %Y'`" >> bfdver.texi; \
+ if [ -n "$(REPORT_BUGS_TEXI)" ]; then \
+ echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> bfdver.texi; \
+ fi
+
# We want install to imply install-info as per GNU standards, despite the
# cygnus option.
install: install-info
diff --git a/src-release b/src-release
index 1f87154..abaae7a 100644
--- a/src-release
+++ b/src-release
@@ -144,7 +144,7 @@ do-proto-toplev: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
CC_FOR_TARGET="$(CC)" CXX_FOR_TARGET="$(CXX)"
# Make links, and run "make diststuff" or "make info" when needed.
rm -rf proto-toplev ; mkdir proto-toplev
- set -e ; dirs="$(TOOL) $(DEVO_SUPPORT) $(SUPPORT_FILES)" ; \
+ set -e ; dirs="$(DEVO_SUPPORT) $(SUPPORT_FILES) $(TOOL)" ; \
for d in $$dirs ; do \
if [ -d $$d ]; then \
if [ ! -f $$d/Makefile ] ; then true ; \