From 8e6f271a217dfad7f71cd0c1132045c4df85878b Mon Sep 17 00:00:00 2001
From: Petter Urkedal <paurkedal@gmail.com>
Date: Sun, 14 Aug 2011 12:37:31 +0200
Subject: [PATCH] Add -uninstalled pkg-config file, move them to pkgconfig/.

* 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.
---
 .gitignore                                     |  3 ++-
 Makefile.am                                    |  3 ++-
 configure.ac                                   | 10 ++++++++--
 pkgconfig/atomic_ops-uninstalled.pc.in         | 10 ++++++++++
 atomic_ops.pc.in => pkgconfig/atomic_ops.pc.in |  0
 5 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 pkgconfig/atomic_ops-uninstalled.pc.in
 rename atomic_ops.pc.in => pkgconfig/atomic_ops.pc.in (100%)

diff --git a/.gitignore b/.gitignore
index d233246..3f13d3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,8 @@
 
 Makefile
 
-/atomic_ops.pc
+/pkgconfig/atomic_ops.pc
+/pkgconfig/atomic_ops-uninstalled.pc
 /autom4te.cache/
 /config.log
 /config.status
diff --git a/Makefile.am b/Makefile.am
index deb22b9..a52cd7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,8 @@ SUBDIRS = src doc tests
 ACLOCAL_AMFLAGS = -I m4
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = atomic_ops.pc
+pkgconfig_DATA = pkgconfig/atomic_ops.pc
+noinst_DATA = pkgconfig/atomic_ops-uninstalled.pc
 
 dist_pkgdata_DATA = COPYING
 
diff --git a/configure.ac b/configure.ac
index 9855a2f..2a16a41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,8 +81,14 @@ AC_SUBST(THREADDLLIBS)
 
 AM_CONDITIONAL(NEED_ASM, test x$need_asm = xtrue)
 
-AC_CONFIG_FILES([Makefile atomic_ops.pc doc/Makefile src/Makefile \
-    tests/Makefile])
+AC_CONFIG_FILES([
+	Makefile
+	doc/Makefile
+	src/Makefile
+	tests/Makefile
+	pkgconfig/atomic_ops.pc
+	pkgconfig/atomic_ops-uninstalled.pc ])
+
 AC_CONFIG_COMMANDS([default],[[]],[[
 PICFLAG="${PICFLAG}"
 CC="${CC}"
diff --git a/pkgconfig/atomic_ops-uninstalled.pc.in b/pkgconfig/atomic_ops-uninstalled.pc.in
new file mode 100644
index 0000000..3618f75
--- /dev/null
+++ b/pkgconfig/atomic_ops-uninstalled.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+top_builddir=@abs_top_builddir@
+top_srcdir=@abs_top_srcdir@
+
+Name: The atomic_ops library (uninstalled)
+Description: Atomic memory update operations
+Version: @PACKAGE_VERSION@
+Libs: ${top_builddir}/src/libatomic_ops.la
+Cflags: -I${top_builddir}/src -I${top_srcdir}/src
diff --git a/atomic_ops.pc.in b/pkgconfig/atomic_ops.pc.in
similarity index 100%
rename from atomic_ops.pc.in
rename to pkgconfig/atomic_ops.pc.in
-- 
2.7.4