From c6d4a9e1809962aef13ac0908329d47eb392b32e Mon Sep 17 00:00:00 2001
From: Petter Urkedal <paurkedal@gmail.com>
Date: Sun, 14 Aug 2011 12:37:31 +0200
Subject: Add -uninstalled pkg-config file, move them to pkgconfig/. (Apply
 commit 8e6f271 from 'master' branch)

* 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.
---
 Makefile.am                            |  3 ++-
 atomic_ops.pc.in                       | 10 ----------
 configure.ac                           |  3 ++-
 pkgconfig/atomic_ops-uninstalled.pc.in | 10 ++++++++++
 pkgconfig/atomic_ops.pc.in             | 10 ++++++++++
 5 files changed, 24 insertions(+), 12 deletions(-)
 delete mode 100644 atomic_ops.pc.in
 create mode 100644 pkgconfig/atomic_ops-uninstalled.pc.in
 create mode 100644 pkgconfig/atomic_ops.pc.in

diff --git a/Makefile.am b/Makefile.am
index 3c0dae4..a21f594 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 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
 
 #distclean-local:
diff --git a/atomic_ops.pc.in b/atomic_ops.pc.in
deleted file mode 100644
index c38832f..0000000
--- a/atomic_ops.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: The atomic_ops project
-Description: Atomic memory update operations portable implementation
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -latomic_ops
-Cflags: -I${includedir}
diff --git a/configure.ac b/configure.ac
index 53f6a44..32ce544 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,7 +93,8 @@ AC_SUBST(THREADDLLIBS)
 AM_CONDITIONAL(HAVE_PTHREAD_H, test x$have_pthreads = xtrue)
 AM_CONDITIONAL(NEED_ASM, test x$need_asm = xtrue)
 
-AC_CONFIG_FILES([Makefile atomic_ops.pc doc/Makefile src/Makefile \
+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([default],[[]],[[
 PICFLAG="${PICFLAG}"
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/pkgconfig/atomic_ops.pc.in b/pkgconfig/atomic_ops.pc.in
new file mode 100644
index 0000000..c38832f
--- /dev/null
+++ b/pkgconfig/atomic_ops.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: The atomic_ops project
+Description: Atomic memory update operations portable implementation
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -latomic_ops
+Cflags: -I${includedir}
-- 
cgit v1.2.1