diff options
| author | Petter Urkedal <paurkedal@gmail.com> | 2011-08-14 12:37:31 +0200 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2012-03-19 19:45:44 +0400 |
| commit | c6d4a9e1809962aef13ac0908329d47eb392b32e (patch) | |
| tree | 160bc20719fc5660f6606b83d05d5d2560bb5af5 | |
| parent | 8ad88e8971137e913afd6f417cce92c279eec375 (diff) | |
| download | libatomic_ops-c6d4a9e1809962aef13ac0908329d47eb392b32e.tar.gz | |
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.
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | pkgconfig/atomic_ops-uninstalled.pc.in | 10 | ||||
| -rw-r--r-- | pkgconfig/atomic_ops.pc.in (renamed from atomic_ops.pc.in) | 0 |
4 files changed, 14 insertions, 2 deletions
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/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/atomic_ops.pc.in b/pkgconfig/atomic_ops.pc.in index c38832f..c38832f 100644 --- a/atomic_ops.pc.in +++ b/pkgconfig/atomic_ops.pc.in |