Re: Maintainermode/make dep-am trouble

["Svein E. Seldal" <Svein dot Seldal at solidas dot com>]

Hi,

Hans-Peter Nilsson wrote:

> I see that too, using the maintainer-mode approved tools and I
> still don't know why it happens.  Perhaps a version mismatch in
> some generated *.m4 somewhere.


I have a change in gas/Makefile.am that I want to check in. I ran the
automake tool (from the binutils special version) and generated
Makefile.in. (BTW: Thanks Ben, the figures are great! Now I understand
better how things are linked.)

To doublecheck it, I ran a diff to compare the newly generated
Makefile.in with the one from cvs and I found a rather queer change.
Please look at the attached diff. Can anoyone else please confirm that
this is correct - I dont want to be resposible for committing garbage :)

Svein


PS! The patch (other) at the head of thread has been applied.

Index: gas/Makefile.in
===================================================================
RCS file: /cvs/src/src/gas/Makefile.in,v
retrieving revision 1.77
diff -c -3 -p -r1.77 Makefile.in
*** gas/Makefile.in	16 Oct 2002 13:27:03 -0000	1.77
--- gas/Makefile.in	11 Nov 2002 14:39:25 -0000
***************
*** 1,6 ****
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
--- 1,6 ----
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
*************** CPU_TYPES = \
*** 189,194 ****
--- 189,195 ----
  	sparc \
  	tahoe \
  	tic30 \
+ 	tic4x \
  	tic54x \
  	tic80 \
  	vax \
*************** maintainer-clean-recursive:
*** 2574,2580 ****
  	dot_seen=no; \
  	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
  	  rev="$$subdir $$rev"; \
! 	  test "$$subdir" != "." || dot_seen=yes; \
  	done; \
  	test "$$dot_seen" = "no" && rev=". $$rev"; \
  	target=`echo $@ | sed s/-recursive//`; \
--- 2575,2581 ----
  	dot_seen=no; \
  	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
  	  rev="$$subdir $$rev"; \
! 	  test "$$subdir" = "." && dot_seen=yes; \
  	done; \
  	test "$$dot_seen" = "no" && rev=". $$rev"; \
  	target=`echo $@ | sed s/-recursive//`; \
Index: gas/Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/Makefile.am,v
retrieving revision 1.67
diff -c -3 -p -r1.67 Makefile.am
*** gas/Makefile.am	16 Oct 2002 13:27:03 -0000	1.67
--- gas/Makefile.am	11 Nov 2002 14:39:25 -0000
*************** CPU_TYPES = \
*** 78,83 ****
--- 78,84 ----
  	sparc \
  	tahoe \
  	tic30 \
+ 	tic4x \
  	tic54x \
  	tic80 \
  	vax \
Index: gas/doc/Makefile.in
===================================================================
RCS file: /cvs/src/src/gas/doc/Makefile.in,v
retrieving revision 1.45
diff -c -3 -p -r1.45 Makefile.in
*** gas/doc/Makefile.in	16 Oct 2002 13:27:04 -0000	1.45
--- gas/doc/Makefile.in	11 Nov 2002 14:39:25 -0000
***************
*** 1,6 ****
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
--- 1,6 ----
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
*************** uninstall-info:
*** 281,287 ****
  	else ii=; fi; \
  	list='$(INFO_DEPS)'; \
  	for file in $$list; do \
! 	  test -z "$$ii" \
  	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
  	done
  	@$(NORMAL_UNINSTALL)
--- 281,287 ----
  	else ii=; fi; \
  	list='$(INFO_DEPS)'; \
  	for file in $$list; do \
! 	  test -z "$ii" \
  	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
  	done
  	@$(NORMAL_UNINSTALL)