* dep-in.sed: Output one filename per line with all lines having

	continuation backslash.  Prefix first line with "A", following
	lines with "B".
	* Makefile.am (DEP): Don't use dep.sed here.
	(DEP1): Run $MKDEP on single files, use dep.sed here on dependencies,
	sort and uniq.
	* Makefile.in: Regenerate.

1 files changed, 402 insertions, 111 deletions

diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index 559723a..a2a4217 100644
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -181,18 +181,23 @@ install-data-local: install-info
 DEP: dep.sed $(gprof_SOURCES) $(noinst_HEADERS) gconfig.h
 	rm -f DEP1
 	$(MAKE) MKDEP="$(MKDEP)" DEP1
-	sed -f dep.sed < DEP1 > DEPA
-	echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA
-	if grep ' /' DEPA > /dev/null 2> /dev/null; then \
+	echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEP1
+	if grep ' /' DEP1 > /dev/null 2> /dev/null; then \
 	  echo 'make DEP failed!'; exit 1; \
 	else \
-	  mv -f DEPA $@; \
+	  mv -f DEP1 $@; \
 	fi
 
 DEP1: $(gprof_SOURCES)
 	echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
 	echo '# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.' >> DEP2
-	$(MKDEP) $(INCLUDES) $(CFLAGS) $? >> DEP2
+	for f in $?; do \
+	  $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
+	  sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
+	  sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+	    sed -e 's/^[AB]/  /' -e '$$s/ \\$$//' >> DEP2; \
+	done
+	rm -f DEPA
 	mv -f DEP2 $@
 
 dep.sed: dep-in.sed config.status
@@ -234,111 +239,397 @@ endif
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-basic_blocks.o: basic_blocks.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h basic_blocks.h corefile.h gmon_io.h \
-  gmon_out.h search_list.h source.h symtab.h sym_ids.h
-call_graph.o: call_graph.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h call_graph.h \
-  corefile.h gmon_io.h gmon_out.h sym_ids.h
-cg_arcs.o: cg_arcs.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
-  call_graph.h cg_arcs.h cg_dfn.h cg_print.h utils.h \
-  sym_ids.h
-cg_dfn.o: cg_dfn.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
-  cg_arcs.h cg_dfn.h utils.h
-cg_print.o: cg_print.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
-  cg_arcs.h cg_print.h hist.h utils.h corefile.h
-corefile.o: corefile.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
-  hist.h corefile.h $(INCDIR)/safe-ctype.h
-gmon_io.o: gmon_io.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/binary-io.h search_list.h source.h symtab.h \
-  cg_arcs.h basic_blocks.h corefile.h call_graph.h gmon_io.h \
-  gmon_out.h gmon.h hertz.h hist.h $(INCDIR)/libiberty.h
-gprof.o: gprof.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h ../bfd/bfdver.h search_list.h \
-  source.h symtab.h basic_blocks.h call_graph.h cg_arcs.h \
-  cg_print.h corefile.h gmon_io.h hertz.h hist.h sym_ids.h \
-  $(INCDIR)/demangle.h
-hertz.o: hertz.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+basic_blocks.o: \
+  basic_blocks.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  basic_blocks.h \
+  corefile.h \
+  gconfig.h \
+  gmon_io.h \
+  gmon_out.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  sym_ids.h \
+  symtab.h
+call_graph.o: \
+  call_graph.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  call_graph.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gmon_io.h \
+  gmon_out.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  sym_ids.h \
+  symtab.h
+cg_arcs.o: \
+  cg_arcs.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  call_graph.h \
+  cg_arcs.h \
+  cg_dfn.h \
+  cg_print.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  sym_ids.h \
+  symtab.h \
+  utils.h
+cg_dfn.o: \
+  cg_dfn.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  cg_dfn.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  symtab.h \
+  utils.h
+cg_print.o: \
+  cg_print.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  cg_print.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h \
+  utils.h
+corefile.o: \
+  corefile.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+gmon_io.o: \
+  gmon_io.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  basic_blocks.h \
+  call_graph.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gmon.h \
+  gmon_io.h \
+  gmon_out.h \
+  gprof.h \
+  hertz.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+gprof.o: \
+  gprof.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  ../bfd/config.h \
+  basic_blocks.h \
+  call_graph.h \
+  cg_arcs.h \
+  cg_print.h \
+  corefile.h \
+  gconfig.h \
+  gmon_io.h \
+  gprof.h \
+  hertz.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  sym_ids.h \
+  symtab.h
+hertz.o: \
+  hertz.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  gconfig.h \
+  gprof.h \
   hertz.h
-hist.o: hist.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
-  corefile.h gmon_io.h gmon_out.h hist.h sym_ids.h utils.h
-source.o: source.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h source.h
-search_list.o: search_list.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h
-symtab.o: symtab.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h corefile.h
-sym_ids.o: sym_ids.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h search_list.h \
-  source.h symtab.h cg_arcs.h sym_ids.h corefile.h
-utils.o: utils.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/demangle.h $(INCDIR)/libiberty.h search_list.h \
-  source.h symtab.h cg_arcs.h utils.h corefile.h
-i386.o: i386.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h corefile.h \
-  hist.h
-alpha.o: alpha.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h corefile.h \
-  hist.h
-vax.o: vax.c gprof.h gconfig.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h search_list.h source.h \
-  symtab.h cg_arcs.h corefile.h hist.h
-tahoe.o: tahoe.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h corefile.h \
-  hist.h
-sparc.o: sparc.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h corefile.h \
-  hist.h
-mips.o: mips.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h corefile.h \
-  hist.h
-flat_bl.o: flat_bl.c $(INCDIR)/ansidecl.h
-bsd_callg_bl.o: bsd_callg_bl.c $(INCDIR)/ansidecl.h
-fsf_callg_bl.o: fsf_callg_bl.c $(INCDIR)/ansidecl.h
+hist.o: \
+  hist.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  corefile.h \
+  gconfig.h \
+  gmon_io.h \
+  gmon_out.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  sym_ids.h \
+  symtab.h \
+  utils.h
+source.o: \
+  source.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h \
+  source.h
+search_list.o: \
+  search_list.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h
+symtab.o: \
+  symtab.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  symtab.h
+sym_ids.o: \
+  sym_ids.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  sym_ids.h \
+  symtab.h
+utils.o: \
+  utils.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  symtab.h \
+  utils.h
+i386.o: \
+  i386.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+alpha.o: \
+  alpha.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+vax.o: \
+  vax.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+tahoe.o: \
+  tahoe.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+sparc.o: \
+  sparc.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+mips.o: \
+  mips.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+flat_bl.o: \
+  flat_bl.c \
+  $(INCDIR)/ansidecl.h
+bsd_callg_bl.o: \
+  bsd_callg_bl.c \
+  $(INCDIR)/ansidecl.h
+fsf_callg_bl.o: \
+  fsf_callg_bl.c \
+  $(INCDIR)/ansidecl.h
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY