Regenerate configure, Makefile.in; update ChangeLog

diff --git a/ChangeLog b/ChangeLog
index afaee7569bab48b02b9b37d4e0625fa7ce303b20..01c6ed09c24c613a130302ca667d1001a5bf6148 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2012-03-19  Ivan Maidanski <ivmai@mail.ru>
+
+       * configure: Regenerate.
+       * Makefile.in: Likewise.
+
+2011-08-14  Petter Urkedal <paurkedal@gmail.com>
+
+       * atomic_ops.pc.in -> pkgconfig/atomic_ops.pc.in: Moved.
+       * pkgconfig/atomic_ops-uninstalled.pc.in: Added developer version.
+       * configure.ac, Makefile.am: Update accordingly.
+
+2011-08-04  Ivan Maidanski <ivmai@mail.ru> (really Petter Urkedal)
+
+       * atomic_ops.pc.in: new file.
+       * Makefile.am (pkgconfigdir, pkgconfig_DATA): new items.
+       * configure.ac (AC_CONFIG_FILES): add atomic_ops.pc.
+       * configure, Makefile.in: Regenerate.
+
 2012-03-07  Ivan Maidanski <ivmai@mail.ru>
 
        * src/atomic_ops/sysdeps/gcc/x86.h

diff --git a/Makefile.in b/Makefile.in
index de0535fc3a607982fa4c7972c32284a71d3a5e3c..84f55e5f5dcf70172909739c37cc69a271f8f722 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -37,10 +37,11 @@ host_triplet = @host@
 target_triplet = @target@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-       $(srcdir)/Makefile.in $(srcdir)/atomic_ops.pc.in \
-       $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-       TODO compile config.guess config.sub depcomp install-sh \
-       missing mkinstalldirs
+       $(srcdir)/Makefile.in $(top_srcdir)/configure \
+       $(top_srcdir)/pkgconfig/atomic_ops-uninstalled.pc.in \
+       $(top_srcdir)/pkgconfig/atomic_ops.pc.in AUTHORS COPYING \
+       ChangeLog INSTALL NEWS compile config.guess config.sub depcomp \
+       install-sh missing mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -49,7 +50,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = atomic_ops.pc
+CONFIG_CLEAN_FILES = pkgconfig/atomic_ops.pc \
+       pkgconfig/atomic_ops-uninstalled.pc
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
@@ -82,7 +84,7 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
-DATA = $(pkgconfig_DATA)
+DATA = $(noinst_DATA) $(pkgconfig_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -233,7 +235,8 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = src doc tests
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = atomic_ops.pc
+pkgconfig_DATA = pkgconfig/atomic_ops.pc
+noinst_DATA = pkgconfig/atomic_ops-uninstalled.pc
 all: all-recursive
 
 .SUFFIXES:
@@ -271,7 +274,9 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
-atomic_ops.pc: $(top_builddir)/config.status $(srcdir)/atomic_ops.pc.in
+pkgconfig/atomic_ops.pc: $(top_builddir)/config.status $(top_srcdir)/pkgconfig/atomic_ops.pc.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
+pkgconfig/atomic_ops-uninstalled.pc: $(top_builddir)/config.status $(top_srcdir)/pkgconfig/atomic_ops-uninstalled.pc.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
 install-pkgconfigDATA: $(pkgconfig_DATA)
        @$(NORMAL_INSTALL)

diff --git a/configure b/configure
index 5040b2ff233439ce0f62141a53af2561205b923c..fddcd38e352b8fa2ff7e0b1800a16da3ae511acc 100755 (executable)
--- a/configure
+++ b/configure
@@ -4862,7 +4862,7 @@ else
 fi
 
 
-ac_config_files="$ac_config_files Makefile atomic_ops.pc doc/Makefile src/Makefile src/atomic_ops/Makefile src/atomic_ops/sysdeps/Makefile tests/Makefile"
+ac_config_files="$ac_config_files Makefile pkgconfig/atomic_ops.pc pkgconfig/atomic_ops-uninstalled.pc doc/Makefile src/Makefile src/atomic_ops/Makefile src/atomic_ops/sysdeps/Makefile tests/Makefile"
 
 ac_config_commands="$ac_config_commands default"
 
@@ -5615,7 +5615,8 @@ do
     "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "atomic_ops.pc") CONFIG_FILES="$CONFIG_FILES atomic_ops.pc" ;;
+    "pkgconfig/atomic_ops.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/atomic_ops.pc" ;;
+    "pkgconfig/atomic_ops-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/atomic_ops-uninstalled.pc" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/atomic_ops/Makefile") CONFIG_FILES="$CONFIG_FILES src/atomic_ops/Makefile" ;;