* Makefile.am: Add ACLOCAL_AMFLAGS.

	* Makefile.in: Regenerate.

12 files changed, 36 insertions, 8 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index d1293f3..246917b 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-14  Steve Ellcey  <sje@cup.hp.com>
+
+	* Makefile.am: Add ACLOCAL_AMFLAGS.
+	* Makefile.in: Regenerate.
+
 2007-04-14  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
 
 	* config/tc-sh.c (align_test_frag_offset_fixed_p): New.
diff --git a/gas/Makefile.am b/gas/Makefile.am
index 5f5439b..ea1f13f 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to generate Makefile.in
 
 AUTOMAKE_OPTIONS = 1.8 cygnus dejagnu
+ACLOCAL_AMFLAGS = -I ..
 
 SUBDIRS = doc po
 # Automake should figure this out on its own.  It doesn't, because
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 615d818..2ca0212 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -243,6 +243,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 te_file = @te_file@
 AUTOMAKE_OPTIONS = 1.8 cygnus dejagnu
+ACLOCAL_AMFLAGS = -I ..
 SUBDIRS = doc po
 # Automake should figure this out on its own.  It doesn't, because
 # of the "cygnus" option.  But distclean still wants it.
diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 842117f..fb5fffc 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-14  Steve Ellcey  <sje@cup.hp.com>
+
+	* Makefile.am: Add ACLOCAL_AMFLAGS.
+	* Makefile.in: Regenerate.
+
 2007-04-10  Vladimir Prus  <vladimir@codesourcery.com>
 
 	* hist.h (struct histogram)
diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index e439b1c..5ebdfe3 100644
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to generate Makefile.in
 
 AUTOMAKE_OPTIONS = cygnus
+ACLOCAL_AMFLAGS = -I ..
 
 SUFFIXES = .m
 
diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index f0b08f5..0afe7c5 100644
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -225,6 +225,7 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
+ACLOCAL_AMFLAGS = -I ..
 SUFFIXES = .m
 SUBDIRS = po
 BASEDIR = $(srcdir)/..
@@ -279,15 +280,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --cygnus '; \
+	      cd $(srcdir) && $(AUTOMAKE) --cygnus  \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus  Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
+	  $(AUTOMAKE) --cygnus  Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 5ea8cac..5912caf 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-14  Steve Ellcey  <sje@cup.hp.com>
+
+	* Makefile.am: Add ACLOCAL_AMFLAGS.
+	* Makefile.in: Regenerate.
+
 2007-04-12  Bob Wilson  <bob.wilson@acm.org>
 	
 	* emulparams/elf32xtensa.sh (OTHER_SECTIONS): KEEP property sections.
diff --git a/ld/Makefile.am b/ld/Makefile.am
index d911f0c..b6ac5a5 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to generate Makefile.in
 
 AUTOMAKE_OPTIONS = cygnus dejagnu
+ACLOCAL_AMFLAGS = -I ..
 
 SUBDIRS = po
 
diff --git a/ld/Makefile.in b/ld/Makefile.in
index de5f6c1..28400cc 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -266,6 +266,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 use_sysroot = @use_sysroot@
 AUTOMAKE_OPTIONS = cygnus dejagnu
+ACLOCAL_AMFLAGS = -I ..
 SUBDIRS = po
 tooldir = $(exec_prefix)/$(target_alias)
 YFLAGS = -d
@@ -721,15 +722,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --cygnus '; \
+	      cd $(srcdir) && $(AUTOMAKE) --cygnus  \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus  Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
+	  $(AUTOMAKE) --cygnus  Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index f0f8af80..d846b72 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-14  Steve Ellcey  <sje@cup.hp.com>
+
+	* Makefile.am: Add ACLOCAL_AMFLAGS.
+	* Makefile.in: Regenerate.
+
 2007-04-13  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* i386-dis.c: Remove trailing white spaces.
diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index b929ab4..96433f3 100644
--- a/opcodes/Makefile.am
+++ b/opcodes/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to generate Makefile.in
 
 AUTOMAKE_OPTIONS = 1.9 cygnus
+ACLOCAL_AMFLAGS = -I ..
 
 SUBDIRS = po
 
diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index 679f8dc..8acad92 100644
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -226,6 +226,7 @@ target_noncanonical = @target_noncanonical@
 target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = 1.9 cygnus
+ACLOCAL_AMFLAGS = -I ..
 SUBDIRS = po
 INCDIR = $(srcdir)/../include
 BFDDIR = $(srcdir)/../bfd