From d92329a97c4ce45ca92d7b939fe4df78979cfb12 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 22 Dec 1997 10:51:42 +0000 Subject: [PATCH] * Makefile.am: Rebuild dependencies. (ALL_MACHINES_CFILES): Add dwarf2.lo. (ALL_MACHINES_CFILES): Add dwarf2.c. * Makefile.in: Rebuild. --- bfd/ChangeLog | 9 +++++++ bfd/Makefile.am | 58 +++++++++++++++++++++++++++------------- bfd/Makefile.in | 82 +++++++++++++++++++++++++++++++++++++++------------------ 3 files changed, 105 insertions(+), 44 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 13859da..8fada51 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,12 @@ +Mon Dec 22 13:20:57 1997 Ian Lance Taylor + + * Makefile.am: Rebuild dependencies. + (ALL_MACHINES_CFILES): Add dwarf2.lo. + (ALL_MACHINES_CFILES): Add dwarf2.c. + * Makefile.in: Rebuild. + + * coff-arm.c: Don't include obstack.h. + Mon Dec 22 13:04:33 1997 Joel Sherrill * config.bfd (i[3456]86*-go32-rtems*): Fix to be the same as diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 86db1ee..3392cf8 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -97,6 +97,7 @@ ALL_MACHINES_CFILES = \ cpu-rs6000.c \ cpu-sh.c \ cpu-sparc.c \ + cpu-v850.c \ cpu-vax.c \ cpu-we32k.c \ cpu-w65.c \ @@ -142,6 +143,7 @@ BFD32_BACKENDS = \ coff-w65.lo \ coff-z8k.lo \ cofflink.lo \ + dwarf2.lo \ ecoff.lo \ ecofflink.lo \ elf32-arc.lo \ @@ -207,7 +209,6 @@ BFD32_BACKENDS = \ sparclynx.lo \ sparcnetbsd.lo \ sunos.lo \ - tekhex.lo \ versados.lo \ xcofflink.lo @@ -246,6 +247,7 @@ BFD32_BACKENDS_CFILES = \ coff-w65.c \ coff-z8k.c \ cofflink.c \ + dwarf2.c \ ecoff.c \ ecofflink.c \ elf32-arc.c \ @@ -263,6 +265,7 @@ BFD32_BACKENDS_CFILES = \ elf32-ppc.c \ elf32-sh.c \ elf32-sparc.c \ + elf32-v850.c \ elf32.c \ elflink.c \ hp300bsd.c \ @@ -307,7 +310,6 @@ BFD32_BACKENDS_CFILES = \ sparclynx.c \ sparcnetbsd.c \ sunos.c \ - tekhex.c \ versados.c \ xcofflink.c @@ -422,6 +424,7 @@ libbfd_la_LIBADD = `cat ofiles` # everything else starts using libtool. FIXME. noinst_LIBRARIES = libbfd.a +libbfd_a_SOURCES = stamp-lib: libbfd.la cp .libs/libbfd.a libbfd.tmp @@ -520,14 +523,19 @@ aout-params.h: gen-aout gen-aout: $(srcdir)/gen-aout.c Makefile $(CC) -o gen-aout $(CFLAGS) $(LFLAGS) $(srcdir)/gen-aout.c -$(BFD_H): stmp-bfd.h ; @true +$(BFD_H): stmp-bfd-h ; @true -stmp-bfd.h: bfd-in3.h +stmp-bfd-h: bfd-in3.h rm -f bfd-tmp.h cp bfd-in3.h bfd-tmp.h $(SHELL) $(srcdir)/../move-if-change bfd-tmp.h $(BFD_H) rm -f bfd-tmp.h - touch stmp-bfd.h + touch stmp-bfd-h + +BFD_H_FILES = bfd-in.h init.c opncls.c libbfd.c section.c archures.c \ + reloc.c syms.c bfd.c archive.c corefile.c targets.c format.c +LIBBFD_H_FILES = libbfd-in.h init.c libbfd.c cache.c reloc.c archures.c elf.c +LIBCOFF_H_FILES = libcoff-in.h coffcode.h # Could really use a "copy-if-change"... headers: @@ -539,25 +547,35 @@ headers: cp $(docdir)/libcoff.h libcoff.h-new $(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h -# The rules for the generated header files are here so that people can -# type `make bfd-in2.h' if they remove it. They are not run by default. -$(srcdir)/bfd-in2.h: - (cd $(docdir); $(MAKE) bfd.h $(FLAGS_TO_PASS)) +# We only rebuild the header files automatically if we have been +# configured with --enable-maintainer-mode. + +$(srcdir)/bfd-in2.h: @MAINT@ stmp-bin2-h +stmp-bin2-h: $(BFD_H_FILES) + (cd $(docdir); $(MAKE) $(FLAGS_TO_PASS) bfd.h) cp $(docdir)/bfd.h bfd-in2.h-new $(SHELL) $(srcdir)/../move-if-change bfd-in2.h-new $(srcdir)/bfd-in2.h -$(srcdir)/libbfd.h: - (cd $(docdir); $(MAKE) libbfd.h $(FLAGS_TO_PASS)) + touch stmp-bin2-h + +$(srcdir)/libbfd.h: @MAINT@ stmp-lbfd-h +stmp-lbfd-h: $(LIBBFD_H_FILES) + (cd $(docdir); $(MAKE) $(FLAGS_TO_PASS) libbfd.h) cp $(docdir)/libbfd.h libbfd.h-new $(SHELL) $(srcdir)/../move-if-change libbfd.h-new $(srcdir)/libbfd.h -$(srcdir)/libcoff.h: - (cd $(docdir); $(MAKE) libcoff.h $(FLAGS_TO_PASS)) + touch stmp-lbfd-h + +$(srcdir)/libcoff.h: @MAINT@ stmp-lcoff-h +stmp-lcoff-h: $(LIBCOFF_H_FILES) + (cd $(docdir); $(MAKE) $(FLAGS_TO_PASS) libcoff.h) cp $(docdir)/libcoff.h libcoff.h-new $(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h + touch stmp-lcoff-h MOSTLYCLEANFILES = elf32-target.h elf64-target.h ofiles stamp-ofiles \ targmatch.h -CLEANFILES = bfd.h dep.sed stmp-bfd.h .dep .dep1 libbfd.a stamp-lib +CLEANFILES = bfd.h dep.sed stmp-bfd-h .dep .dep1 libbfd.a stamp-lib \ + stmp-bin2-h stmp-lbfd-h stmp-lcoff-h start-sanitize-d30v: elf32-d30v.lo: elf32-d30v.c elf-bfd.h $(INCDIR)/elf/common.h \ @@ -565,11 +583,6 @@ elf32-d30v.lo: elf32-d30v.c elf-bfd.h $(INCDIR)/elf/common.h \ elf32-target.h end-sanitize-d30v: -cpu-v850.lo: cpu-v850.c -elf32-v850.lo: elf32-v850.c $(INCDIR)/bfdlink.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - elf32-target.h - start-sanitize-tic80: cpu-tic80.lo: cpu-tic80.c coff-tic80.lo: coff-tic80.c $(INCDIR)/bfdlink.h elf-bfd.h \ @@ -631,6 +644,7 @@ cpu-powerpc.lo: cpu-powerpc.c cpu-rs6000.lo: cpu-rs6000.c cpu-sh.lo: cpu-sh.c cpu-sparc.lo: cpu-sparc.c +cpu-v850.lo: cpu-v850.c cpu-vax.lo: cpu-vax.c cpu-we32k.lo: cpu-we32k.c cpu-w65.lo: cpu-w65.c @@ -726,6 +740,9 @@ coff-z8k.lo: coff-z8k.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/z8k.h \ $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h cofflink.lo: cofflink.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \ libcoff.h +dwarf2.lo: dwarf2.c elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/elf/dwarf2.h ecoff.lo: ecoff.c $(INCDIR)/bfdlink.h $(INCDIR)/aout/ar.h \ $(INCDIR)/aout/ranlib.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ libaout.h $(INCDIR)/aout/aout64.h $(INCDIR)/coff/internal.h \ @@ -784,6 +801,9 @@ elf32-sh.lo: elf32-sh.c $(INCDIR)/bfdlink.h elf-bfd.h \ elf32-sparc.lo: elf32-sparc.c $(INCDIR)/bfdlink.h elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ $(INCDIR)/elf/sparc.h elf32-target.h +elf32-v850.lo: elf32-v850.c $(INCDIR)/bfdlink.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/elf/v850.h elf32-target.h elf32.lo: elf32.c elfcode.h $(INCDIR)/bfdlink.h elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ $(INCDIR)/fnmatch.h elfcore.h elflink.h diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 4c67810..9a831bd 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -5,7 +5,7 @@ # gives unlimited permission to copy, distribute and modify it. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -179,6 +179,7 @@ ALL_MACHINES_CFILES = \ cpu-rs6000.c \ cpu-sh.c \ cpu-sparc.c \ + cpu-v850.c \ cpu-vax.c \ cpu-we32k.c \ cpu-w65.c \ @@ -224,6 +225,7 @@ BFD32_BACKENDS = \ coff-w65.lo \ coff-z8k.lo \ cofflink.lo \ + dwarf2.lo \ ecoff.lo \ ecofflink.lo \ elf32-arc.lo \ @@ -289,7 +291,6 @@ BFD32_BACKENDS = \ sparclynx.lo \ sparcnetbsd.lo \ sunos.lo \ - tekhex.lo \ versados.lo \ xcofflink.lo @@ -328,6 +329,7 @@ BFD32_BACKENDS_CFILES = \ coff-w65.c \ coff-z8k.c \ cofflink.c \ + dwarf2.c \ ecoff.c \ ecofflink.c \ elf32-arc.c \ @@ -345,6 +347,7 @@ BFD32_BACKENDS_CFILES = \ elf32-ppc.c \ elf32-sh.c \ elf32-sparc.c \ + elf32-v850.c \ elf32.c \ elflink.c \ hp300bsd.c \ @@ -389,7 +392,6 @@ BFD32_BACKENDS_CFILES = \ sparclynx.c \ sparcnetbsd.c \ sunos.c \ - tekhex.c \ versados.c \ xcofflink.c @@ -489,14 +491,21 @@ libbfd_la_LIBADD = `cat ofiles` # everything else starts using libtool. FIXME. noinst_LIBRARIES = libbfd.a +libbfd_a_SOURCES = BFD_H_DEPS= $(INCDIR)/ansidecl.h LOCAL_H_DEPS= libbfd.h sysdep.h config.h +BFD_H_FILES = bfd-in.h init.c opncls.c libbfd.c section.c archures.c \ + reloc.c syms.c bfd.c archive.c corefile.c targets.c format.c +LIBBFD_H_FILES = libbfd-in.h init.c libbfd.c cache.c reloc.c archures.c elf.c +LIBCOFF_H_FILES = libcoff-in.h coffcode.h + MOSTLYCLEANFILES = elf32-target.h elf64-target.h ofiles stamp-ofiles \ targmatch.h -CLEANFILES = bfd.h dep.sed stmp-bfd.h .dep .dep1 libbfd.a stamp-lib +CLEANFILES = bfd.h dep.sed stmp-bfd-h .dep .dep1 libbfd.a stamp-lib \ + stmp-bin2-h stmp-lbfd-h stmp-lcoff-h ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = config.h @@ -509,8 +518,7 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libbfd_a_LIBADD = -libbfd_a_SOURCES = libbfd.a.c -libbfd_a_OBJECTS = libbfd.a.o +libbfd_a_OBJECTS = LTLIBRARIES = $(lib_LTLIBRARIES) libbfd_la_LDFLAGS = @@ -531,13 +539,13 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP = --best -SOURCES = libbfd.a.c $(libbfd_la_SOURCES) -OBJECTS = libbfd.a.o $(libbfd_la_OBJECTS) +SOURCES = $(libbfd_a_SOURCES) $(libbfd_la_SOURCES) +OBJECTS = $(libbfd_a_OBJECTS) $(libbfd_la_OBJECTS) default: all .SUFFIXES: -.SUFFIXES: .c .lo .o +.SUFFIXES: .S .c .lo .o .s $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile @@ -584,6 +592,12 @@ distclean-noinstLIBRARIES: maintainer-clean-noinstLIBRARIES: +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + .c.o: $(COMPILE) -c $< @@ -600,6 +614,13 @@ maintainer-clean-compile: .c.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< +# These are just copies of the above rule. +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + mostlyclean-libtool: rm -f *.lo @@ -959,14 +980,14 @@ aout-params.h: gen-aout gen-aout: $(srcdir)/gen-aout.c Makefile $(CC) -o gen-aout $(CFLAGS) $(LFLAGS) $(srcdir)/gen-aout.c -$(BFD_H): stmp-bfd.h ; @true +$(BFD_H): stmp-bfd-h ; @true -stmp-bfd.h: bfd-in3.h +stmp-bfd-h: bfd-in3.h rm -f bfd-tmp.h cp bfd-in3.h bfd-tmp.h $(SHELL) $(srcdir)/../move-if-change bfd-tmp.h $(BFD_H) rm -f bfd-tmp.h - touch stmp-bfd.h + touch stmp-bfd-h # Could really use a "copy-if-change"... headers: @@ -978,20 +999,29 @@ headers: cp $(docdir)/libcoff.h libcoff.h-new $(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h -# The rules for the generated header files are here so that people can -# type `make bfd-in2.h' if they remove it. They are not run by default. -$(srcdir)/bfd-in2.h: - (cd $(docdir); $(MAKE) bfd.h $(FLAGS_TO_PASS)) +# We only rebuild the header files automatically if we have been +# configured with --enable-maintainer-mode. + +$(srcdir)/bfd-in2.h: @MAINT@ stmp-bin2-h +stmp-bin2-h: $(BFD_H_FILES) + (cd $(docdir); $(MAKE) $(FLAGS_TO_PASS) bfd.h) cp $(docdir)/bfd.h bfd-in2.h-new $(SHELL) $(srcdir)/../move-if-change bfd-in2.h-new $(srcdir)/bfd-in2.h -$(srcdir)/libbfd.h: - (cd $(docdir); $(MAKE) libbfd.h $(FLAGS_TO_PASS)) + touch stmp-bin2-h + +$(srcdir)/libbfd.h: @MAINT@ stmp-lbfd-h +stmp-lbfd-h: $(LIBBFD_H_FILES) + (cd $(docdir); $(MAKE) $(FLAGS_TO_PASS) libbfd.h) cp $(docdir)/libbfd.h libbfd.h-new $(SHELL) $(srcdir)/../move-if-change libbfd.h-new $(srcdir)/libbfd.h -$(srcdir)/libcoff.h: - (cd $(docdir); $(MAKE) libcoff.h $(FLAGS_TO_PASS)) + touch stmp-lbfd-h + +$(srcdir)/libcoff.h: @MAINT@ stmp-lcoff-h +stmp-lcoff-h: $(LIBCOFF_H_FILES) + (cd $(docdir); $(MAKE) $(FLAGS_TO_PASS) libcoff.h) cp $(docdir)/libcoff.h libcoff.h-new $(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h + touch stmp-lcoff-h start-sanitize-d30v: elf32-d30v.lo: elf32-d30v.c elf-bfd.h $(INCDIR)/elf/common.h \ @@ -999,11 +1029,6 @@ elf32-d30v.lo: elf32-d30v.c elf-bfd.h $(INCDIR)/elf/common.h \ elf32-target.h end-sanitize-d30v: -cpu-v850.lo: cpu-v850.c -elf32-v850.lo: elf32-v850.c $(INCDIR)/bfdlink.h elf-bfd.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - elf32-target.h - start-sanitize-tic80: cpu-tic80.lo: cpu-tic80.c coff-tic80.lo: coff-tic80.c $(INCDIR)/bfdlink.h elf-bfd.h \ @@ -1065,6 +1090,7 @@ cpu-powerpc.lo: cpu-powerpc.c cpu-rs6000.lo: cpu-rs6000.c cpu-sh.lo: cpu-sh.c cpu-sparc.lo: cpu-sparc.c +cpu-v850.lo: cpu-v850.c cpu-vax.lo: cpu-vax.c cpu-we32k.lo: cpu-we32k.c cpu-w65.lo: cpu-w65.c @@ -1160,6 +1186,9 @@ coff-z8k.lo: coff-z8k.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/z8k.h \ $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h cofflink.lo: cofflink.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \ libcoff.h +dwarf2.lo: dwarf2.c elf-bfd.h $(INCDIR)/elf/common.h \ + $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \ + $(INCDIR)/elf/dwarf2.h ecoff.lo: ecoff.c $(INCDIR)/bfdlink.h $(INCDIR)/aout/ar.h \ $(INCDIR)/aout/ranlib.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ libaout.h $(INCDIR)/aout/aout64.h $(INCDIR)/coff/internal.h \ @@ -1218,6 +1247,9 @@ elf32-sh.lo: elf32-sh.c $(INCDIR)/bfdlink.h elf-bfd.h \ elf32-sparc.lo: elf32-sparc.c $(INCDIR)/bfdlink.h elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ $(INCDIR)/elf/sparc.h elf32-target.h +elf32-v850.lo: elf32-v850.c $(INCDIR)/bfdlink.h elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/elf/v850.h elf32-target.h elf32.lo: elf32.c elfcode.h $(INCDIR)/bfdlink.h elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ $(INCDIR)/fnmatch.h elfcore.h elflink.h -- 2.7.4