This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
fix non-bfd gas breakage
- From: Alan Modra <amodra at bigpond dot net dot au>
- To: binutils at sources dot redhat dot com
- Date: Wed, 16 Oct 2002 22:50:54 +0930
- Subject: fix non-bfd gas breakage
My change to bfd version files broke non-bfd gas due to as.o
depending on a missing ../bfd/bfdver.h.
* configure.in (BFDVER_H): Set and subst.
* dep-in.sed: Replace bfdver.h with $(BFDVER_H).
* Makefile.am: Run "make dep-am".
(BFDVER_H): Define.
* configure: Regenerate.
* Makefile.in: Regenerate.
* doc/Makefile.in: Regenerate.
Index: gas/Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/Makefile.am,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile.am
--- gas/Makefile.am 14 Oct 2002 12:08:47 -0000 1.66
+++ gas/Makefile.am 16 Oct 2002 11:47:51 -0000
@@ -493,6 +493,8 @@ GASLIBS = @OPCODES_LIB@ @BFDLIB@ ../libi
# Files to be copied away after each stage in building.
STAGESTUFF = *.o $(noinst_PROGRAMS)
+BFDVER_H = @BFDVER_H@
+
$(OBJS): @ALL_OBJ_DEPS@
as_new_SOURCES = $(GAS_CFILES)
@@ -1882,11 +1884,6 @@ DEPOBJ_sh_elf = $(INCDIR)/symcat.h $(src
$(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-sh.h \
$(INCDIR)/safe-ctype.h subsegs.h $(INCDIR)/obstack.h \
struc-symbol.h $(INCDIR)/aout/aout64.h
-DEPOBJ_sh64_coff = $(INCDIR)/symcat.h $(srcdir)/config/obj-coff.h \
- $(srcdir)/config/tc-sh64.h $(srcdir)/config/tc-sh.h \
- $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h $(INCDIR)/coff/internal.h \
- $(INCDIR)/coff/sh.h $(INCDIR)/coff/external.h $(BFDDIR)/libcoff.h \
- $(INCDIR)/bfdlink.h $(INCDIR)/obstack.h subsegs.h
DEPOBJ_sh64_elf = $(INCDIR)/symcat.h $(srcdir)/config/obj-elf.h \
$(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
$(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-sh64.h \
@@ -2248,10 +2245,6 @@ DEP_sh_coff = $(srcdir)/config/obj-coff.
DEP_sh_elf = $(srcdir)/config/obj-elf.h $(INCDIR)/symcat.h \
$(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
$(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-sh.h
-DEP_sh64_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-sh64.h \
- $(srcdir)/config/tc-sh.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h \
- $(INCDIR)/symcat.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/sh.h \
- $(INCDIR)/coff/external.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h
DEP_sh64_elf = $(srcdir)/config/obj-elf.h $(INCDIR)/symcat.h \
$(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
$(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-sh64.h \
@@ -2337,7 +2330,7 @@ BMKDEP = #DO NOT PUT ANYTHING BETWEEN TH
#MKDEP DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING BELOW.
app.o: app.c $(INCDIR)/symcat.h
as.o: as.c $(INCDIR)/symcat.h subsegs.h $(INCDIR)/obstack.h \
- output-file.h sb.h macro.h dwarf2dbg.h ../bfd/bfdver.h
+ output-file.h sb.h macro.h dwarf2dbg.h $(BFDVER_H)
atof-generic.o: atof-generic.c $(INCDIR)/symcat.h $(INCDIR)/safe-ctype.h
bignum-copy.o: bignum-copy.c $(INCDIR)/symcat.h
cond.o: cond.c $(INCDIR)/symcat.h macro.h sb.h $(INCDIR)/obstack.h
Index: gas/configure.in
===================================================================
RCS file: /cvs/src/src/gas/configure.in,v
retrieving revision 1.118
diff -u -p -r1.118 configure.in
--- gas/configure.in 14 Oct 2002 06:59:06 -0000 1.118
+++ gas/configure.in 16 Oct 2002 11:47:58 -0000
@@ -891,6 +891,7 @@ esac
case "${need_bfd}" in
yes)
BFDLIB=../bfd/libbfd.la
+ BFDVER_H=../bfd/bfdver.h
ALL_OBJ_DEPS="$ALL_OBJ_DEPS"' ../bfd/bfd.h $(INCDIR)/symcat.h'
;;
esac
@@ -898,6 +899,7 @@ esac
AC_SUBST(BFDLIB)
AC_SUBST(OPCODES_LIB)
+AC_SUBST(BFDVER_H)
AC_SUBST(ALL_OBJ_DEPS)
AC_DEFINE_UNQUOTED(TARGET_ALIAS, "${target_alias}", [Target alias.])
Index: gas/dep-in.sed
===================================================================
RCS file: /cvs/src/src/gas/dep-in.sed,v
retrieving revision 1.5
diff -u -p -r1.5 dep-in.sed
--- gas/dep-in.sed 25 May 2002 12:53:27 -0000 1.5
+++ gas/dep-in.sed 16 Oct 2002 11:47:59 -0000
@@ -13,6 +13,7 @@ s!@TOPDIR@/opcodes!$(srcdir)/../opcodes!
s!@SRCDIR@/!!g
s! \$(srcdir)/config/te-generic\.h!!g
s! \.\./bfd/bfd\.h!!g
+s! \.\./bfd/bfdver\.h!$(BFDVER_H)!g
s! itbl-cpu\.h!!g
s! itbl-parse\.h!!g
--
Alan Modra
IBM OzLabs - Linux Technology Centre