Regenerate.

(Logical change 1.271)

5 files changed, 54 insertions, 33 deletions

diff --git a/Makefile.in b/Makefile.in
index 34ea3dfa..28b5c1a2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -66,18 +66,19 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	uninstall-recursive
 am__include_HEADERS_DIST = include/libunwind-x86_64.h \
 	include/libunwind-x86.h include/libunwind-hppa.h \
-	include/libunwind-ia64.h include/libunwind-common.h.in \
-	include/libunwind-dynamic.h include/libunwind-ptrace.h \
-	include/libunwind.h include/unwind.h
+	include/libunwind-ia64.h include/libunwind-dynamic.h \
+	include/libunwind-ptrace.h include/libunwind.h \
+	include/unwind.h
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(includedir)"
+am__installdirs = "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"
 includeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(include_HEADERS)
+nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS) $(nodist_include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -224,17 +225,18 @@ target_vendor = @target_vendor@
 @ARCH_HPPA_TRUE@@ARCH_IA64_FALSE@include_HEADERS_tdep = include/libunwind-hppa.h
 @ARCH_IA64_TRUE@include_HEADERS_tdep = include/libunwind-ia64.h
 include_HEADERS_common = $(include_HEADERS_tdep)		\
-	include/libunwind-common.h.in				\
 	include/libunwind-dynamic.h include/libunwind-ptrace.h
 
 @REMOTE_ONLY_FALSE@include_HEADERS = $(include_HEADERS_common) include/libunwind.h \
 @REMOTE_ONLY_FALSE@		    include/unwind.h
 
 @REMOTE_ONLY_TRUE@include_HEADERS = $(include_HEADERS_common)
+nodist_include_HEADERS = include/libunwind-common.h
 SUBDIRS = src tests doc
 EXTRA_DIST = include/dwarf.h include/dwarf_i.h				\
 	include/internal.h include/mempool.h				\
 	include/remote.h						\
+	include/libunwind-common.h.in					\
 	include/libunwind-ia64.h include/tdep-ia64.h			\
 	include/ia64/jmpbuf.h include/ia64/rse.h include/ia64/script.h	\
 	include/libunwind-hppa.h include/tdep-hppa.h			\
@@ -326,6 +328,23 @@ uninstall-includeHEADERS:
 	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 	done
+install-nodist_includeHEADERS: $(nodist_include_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	@list='$(nodist_include_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+	  $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+	done
+
+uninstall-nodist_includeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nodist_include_HEADERS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
+	done
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -594,7 +613,7 @@ check: check-recursive
 all-am: Makefile $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(includedir)"; do \
+	for dir in "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
@@ -642,7 +661,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-includeHEADERS
+install-data-am: install-includeHEADERS install-nodist_includeHEADERS
 
 install-exec-am:
 
@@ -670,7 +689,8 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am
+uninstall-am: uninstall-includeHEADERS uninstall-info-am \
+	uninstall-nodist_includeHEADERS
 
 uninstall-info: uninstall-info-recursive
 
@@ -683,13 +703,14 @@ uninstall-info: uninstall-info-recursive
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-exec \
 	install-exec-am install-includeHEADERS install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-includeHEADERS \
-	uninstall-info-am
+	install-info-am install-man install-nodist_includeHEADERS \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-includeHEADERS uninstall-info-am \
+	uninstall-nodist_includeHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/aclocal.m4 b/aclocal.m4
index 5cae766b..e17ce3e1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
@@ -5956,7 +5956,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.1])])
+	 [AM_AUTOMAKE_VERSION([1.9.2])])
 
 # Figure out how to run the assembler.             -*- Autoconf -*-
 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 8dbd66ca..f010105e 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/Makefile.in b/src/Makefile.in
index ea9625bb..e92ecf68 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -1896,22 +1896,22 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f dwarf/$(DEPDIR)/$(am__dirstamp)
+	-rm -f dwarf/$(am__dirstamp)
 	-rm -f hppa/$(DEPDIR)/$(am__dirstamp)
-	-rm -f unwind/$(DEPDIR)/$(am__dirstamp)
-	-rm -f x86/$(DEPDIR)/$(am__dirstamp)
-	-rm -f x86/$(am__dirstamp)
+	-rm -f hppa/$(am__dirstamp)
 	-rm -f ia64/$(DEPDIR)/$(am__dirstamp)
-	-rm -f dwarf/$(am__dirstamp)
-	-rm -f x86_64/$(am__dirstamp)
-	-rm -f ptrace/$(am__dirstamp)
+	-rm -f ia64/$(am__dirstamp)
+	-rm -f mi/$(DEPDIR)/$(am__dirstamp)
 	-rm -f mi/$(am__dirstamp)
-	-rm -f dwarf/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ptrace/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ptrace/$(am__dirstamp)
+	-rm -f unwind/$(DEPDIR)/$(am__dirstamp)
 	-rm -f unwind/$(am__dirstamp)
-	-rm -f mi/$(DEPDIR)/$(am__dirstamp)
+	-rm -f x86/$(DEPDIR)/$(am__dirstamp)
+	-rm -f x86/$(am__dirstamp)
 	-rm -f x86_64/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ptrace/$(DEPDIR)/$(am__dirstamp)
-	-rm -f hppa/$(am__dirstamp)
-	-rm -f ia64/$(am__dirstamp)
+	-rm -f x86_64/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 57ea4737..e7583a60 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,