diff --git a/Makefile.in b/Makefile.in index 6b2d9bcb..34ea3dfa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,10 +40,10 @@ target_triplet = @target@ DIST_COMMON = README $(am__configure_deps) $(am__include_HEADERS_DIST) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/configure $(top_srcdir)/include/config.h.in \ - AUTHORS COPYING ChangeLog INSTALL NEWS TODO config/compile \ - config/config.guess config/config.sub config/depcomp \ - config/install-sh config/ltmain.sh config/missing \ - config/mkinstalldirs + $(top_srcdir)/include/libunwind-common.h.in AUTHORS COPYING \ + ChangeLog INSTALL NEWS TODO config/compile config/config.guess \ + config/config.sub config/depcomp config/install-sh \ + config/ltmain.sh config/missing config/mkinstalldirs subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ @@ -54,7 +54,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h -CONFIG_CLEAN_FILES = include/libunwind.h include/tdep.h +CONFIG_CLEAN_FILES = include/libunwind-common.h include/libunwind.h \ + include/tdep.h SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -65,7 +66,7 @@ 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 \ + include/libunwind-ia64.h include/libunwind-common.h.in \ include/libunwind-dynamic.h include/libunwind-ptrace.h \ include/libunwind.h include/unwind.h am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -158,6 +159,10 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_EXTRA = @PKG_EXTRA@ +PKG_MAINTAINER = @PKG_MAINTAINER@ +PKG_MAJOR = @PKG_MAJOR@ +PKG_MINOR = @PKG_MINOR@ RANLIB = @RANLIB@ REMOTE_ONLY_FALSE = @REMOTE_ONLY_FALSE@ REMOTE_ONLY_TRUE = @REMOTE_ONLY_TRUE@ @@ -218,7 +223,8 @@ target_vendor = @target_vendor@ @ARCH_HPPA_FALSE@@ARCH_IA64_FALSE@@ARCH_X86_TRUE@include_HEADERS_tdep = include/libunwind-x86.h @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 \ +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 \ @@ -233,10 +239,9 @@ EXTRA_DIST = include/dwarf.h include/dwarf_i.h \ include/ia64/jmpbuf.h include/ia64/rse.h include/ia64/script.h \ include/libunwind-hppa.h include/tdep-hppa.h \ include/libunwind-x86.h include/tdep-x86.h \ - include/x86/dwarf-config.h \ + include/x86/jmpbuf.h include/x86/dwarf-config.h \ include/libunwind-x86_64.h include/tdep-x86_64.h \ - include/x86/dwarf-config.h \ - include/x86_64/dwarf-config.h + include/x86_64/jmpbuf.h include/x86_64/dwarf-config.h DISTCLEANFILES = include/libunwind.h include/tdep.h all: all-recursive @@ -292,6 +297,8 @@ $(top_srcdir)/include/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) distclean-hdr: -rm -f include/config.h include/stamp-h1 +include/libunwind-common.h: $(top_builddir)/config.status $(top_srcdir)/include/libunwind-common.h.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo diff --git a/configure b/configure index abaa8b1d..87bf981d 100644 --- a/configure +++ b/configure @@ -465,7 +465,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCAS CCASFLAGS LIBOBJS REMOTE_ONLY_TRUE REMOTE_ONLY_FALSE ARCH_IA64_TRUE ARCH_IA64_FALSE ARCH_HPPA_TRUE ARCH_HPPA_FALSE ARCH_X86_TRUE ARCH_X86_FALSE ARCH_X86_64_TRUE ARCH_X86_64_FALSE OS_LINUX_TRUE OS_LINUX_FALSE OS_HPUX_TRUE OS_HPUX_FALSE build_arch arch ARCH LDFLAGS_STATIC_LIBCXA LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCAS CCASFLAGS LIBOBJS REMOTE_ONLY_TRUE REMOTE_ONLY_FALSE ARCH_IA64_TRUE ARCH_IA64_FALSE ARCH_HPPA_TRUE ARCH_HPPA_FALSE ARCH_X86_TRUE ARCH_X86_FALSE ARCH_X86_64_TRUE ARCH_X86_64_FALSE OS_LINUX_TRUE OS_LINUX_FALSE OS_HPUX_TRUE OS_HPUX_FALSE build_arch arch ARCH LDFLAGS_STATIC_LIBCXA PKG_MAJOR PKG_MINOR PKG_EXTRA PKG_MAINTAINER LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -20936,13 +20936,22 @@ CCASFLAGS="${CCASFLAGS} ${CPPFLAGS}" arch="$target_arch" ARCH=`echo $target_arch | tr a-z A-Z` +PKG_MAJOR=0 +PKG_MINOR=98 +PKG_EXTRA=-alpha +PKG_MAINTAINER=libunwind@linux.hpl.hp.com - ac_config_files="$ac_config_files Makefile src/Makefile tests/Makefile tests/check-namespace.sh doc/Makefile doc/common.tex" + + + + + + ac_config_files="$ac_config_files Makefile src/Makefile tests/Makefile tests/check-namespace.sh doc/Makefile doc/common.tex include/libunwind-common.h" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -21565,6 +21574,7 @@ do "tests/check-namespace.sh" ) CONFIG_FILES="$CONFIG_FILES tests/check-namespace.sh" ;; "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/common.tex" ) CONFIG_FILES="$CONFIG_FILES doc/common.tex" ;; + "include/libunwind-common.h" ) CONFIG_FILES="$CONFIG_FILES include/libunwind-common.h" ;; "include/libunwind.h" ) CONFIG_LINKS="$CONFIG_LINKS include/libunwind.h:include/libunwind-$target_arch.h" ;; "include/tdep.h" ) CONFIG_LINKS="$CONFIG_LINKS include/tdep.h:include/tdep-$target_arch.h" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; @@ -21748,6 +21758,10 @@ s,@build_arch@,$build_arch,;t t s,@arch@,$arch,;t t s,@ARCH@,$ARCH,;t t s,@LDFLAGS_STATIC_LIBCXA@,$LDFLAGS_STATIC_LIBCXA,;t t +s,@PKG_MAJOR@,$PKG_MAJOR,;t t +s,@PKG_MINOR@,$PKG_MINOR,;t t +s,@PKG_EXTRA@,$PKG_EXTRA,;t t +s,@PKG_MAINTAINER@,$PKG_MAINTAINER,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/doc/Makefile.in b/doc/Makefile.in index 11770250..8dbd66ca 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -121,6 +121,10 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_EXTRA = @PKG_EXTRA@ +PKG_MAINTAINER = @PKG_MAINTAINER@ +PKG_MAJOR = @PKG_MAJOR@ +PKG_MINOR = @PKG_MINOR@ RANLIB = @RANLIB@ REMOTE_ONLY_FALSE = @REMOTE_ONLY_FALSE@ REMOTE_ONLY_TRUE = @REMOTE_ONLY_TRUE@ diff --git a/src/Makefile.in b/src/Makefile.in index c2198b24..ea9625bb 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -412,6 +412,10 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_EXTRA = @PKG_EXTRA@ +PKG_MAINTAINER = @PKG_MAINTAINER@ +PKG_MAJOR = @PKG_MAJOR@ +PKG_MINOR = @PKG_MINOR@ RANLIB = @RANLIB@ REMOTE_ONLY_FALSE = @REMOTE_ONLY_FALSE@ REMOTE_ONLY_TRUE = @REMOTE_ONLY_TRUE@ diff --git a/tests/Makefile.in b/tests/Makefile.in index bb41b4fd..e1d16d6b 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -353,6 +353,10 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_EXTRA = @PKG_EXTRA@ +PKG_MAINTAINER = @PKG_MAINTAINER@ +PKG_MAJOR = @PKG_MAJOR@ +PKG_MINOR = @PKG_MINOR@ RANLIB = @RANLIB@ REMOTE_ONLY_FALSE = @REMOTE_ONLY_FALSE@ REMOTE_ONLY_TRUE = @REMOTE_ONLY_TRUE@