From 0d97ac6d2b8616073a3b047bfe22416a452950a5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 19 Jun 2006 23:00:21 +0000 Subject: name the pkg-config files after the library names git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1037 fefdeb5f-60dc-0310-8127-8f9354f1896f --- Makefile.am | 4 ++-- configure.ac | 4 ++-- libpulse-glib-mainloop.pc.in | 11 ----------- libpulse-glib12-mainloop.pc.in | 11 ----------- libpulse-mainloop-glib.pc.in | 11 +++++++++++ libpulse-mainloop-glib12.pc.in | 11 +++++++++++ src/pulse/pulseaudio.h | 19 +++++++++---------- 7 files changed, 35 insertions(+), 36 deletions(-) delete mode 100644 libpulse-glib-mainloop.pc.in delete mode 100644 libpulse-glib12-mainloop.pc.in create mode 100644 libpulse-mainloop-glib.pc.in create mode 100644 libpulse-mainloop-glib12.pc.in diff --git a/Makefile.am b/Makefile.am index 4174a39b..8a0eaf49 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,12 +33,12 @@ endif if HAVE_GLIB20 pkgconfig_DATA += \ - libpulse-glib-mainloop.pc + libpulse-mainloop-glib.pc endif if HAVE_GLIB12 pkgconfig_DATA += \ - libpulse-glib12-mainloop.pc + libpulse-mainloop-glib12.pc endif if USE_LYNX diff --git a/configure.ac b/configure.ac index 4f530347..bb72ee37 100644 --- a/configure.ac +++ b/configure.ac @@ -698,8 +698,8 @@ src/Makefile libpulse.pc libpulse-simple.pc libpulse-browse.pc -libpulse-glib-mainloop.pc -libpulse-glib12-mainloop.pc +libpulse-mainloop-glib.pc +libpulse-mainloop-glib12.pc doc/Makefile doc/README.html doc/cli.html diff --git a/libpulse-glib-mainloop.pc.in b/libpulse-glib-mainloop.pc.in deleted file mode 100644 index 169910ba..00000000 --- a/libpulse-glib-mainloop.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: libpulse-glib-mainloop -Description: GLIB 2.0 Main Loop Wrapper for PulseAudio -Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lpulse-mainloop-glib -Cflags: -D_REENTRANT -I${includedir} -Requires: libpulse glib-2.0 diff --git a/libpulse-glib12-mainloop.pc.in b/libpulse-glib12-mainloop.pc.in deleted file mode 100644 index f525c370..00000000 --- a/libpulse-glib12-mainloop.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: libpulse-glib12-mainloop -Description: GLIB 1.2 Main Loop Wrapper for PulseAudio -Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lpulse-mainloop-glib12 -Cflags: -D_REENTRANT -I${includedir} -Requires: libpulse glib diff --git a/libpulse-mainloop-glib.pc.in b/libpulse-mainloop-glib.pc.in new file mode 100644 index 00000000..a9a51cf7 --- /dev/null +++ b/libpulse-mainloop-glib.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: libpulse-mainloop-glib +Description: GLIB 2.0 Main Loop Wrapper for PulseAudio +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lpulse-mainloop-glib +Cflags: -D_REENTRANT -I${includedir} +Requires: libpulse glib-2.0 diff --git a/libpulse-mainloop-glib12.pc.in b/libpulse-mainloop-glib12.pc.in new file mode 100644 index 00000000..7a038826 --- /dev/null +++ b/libpulse-mainloop-glib12.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: libpulse-mainloop-glib12 +Description: GLIB 1.2 Main Loop Wrapper for PulseAudio +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lpulse-mainloop-glib12 +Cflags: -D_REENTRANT -I${includedir} +Requires: libpulse glib diff --git a/src/pulse/pulseaudio.h b/src/pulse/pulseaudio.h index 5c526dc7..71262eaa 100644 --- a/src/pulse/pulseaudio.h +++ b/src/pulse/pulseaudio.h @@ -44,7 +44,7 @@ #include /** \file - * Include all pulselib header files at once. The following + * Include all libpulse header files at once. The following * files are included: \ref mainloop-api.h, \ref sample.h, \ref def.h, * \ref context.h, \ref stream.h, \ref introspect.h, \ref subscribe.h, * \ref scache.h, \ref version.h, \ref error.h, \ref channelmap.h, @@ -56,7 +56,7 @@ * * \section intro_sec Introduction * - * This document describes the client API for the pulseaudio sound + * This document describes the client API for the PulseAudio sound * server. The API comes in two flavours to accomodate different styles * of applications and different needs in complexity: * @@ -78,7 +78,7 @@ * * Use this if you develop your programs in asynchronous, event loop * based style or if you want to use the advanced features of the - * pulseaudio API. A guide can be found in \subpage async. + * PulseAudio API. A guide can be found in \subpage async. * * By using the built-in threaded main loop, it is possible to acheive a * pseudo-synchronous API, which can be useful in synchronous applications @@ -87,7 +87,7 @@ * * \section thread_sec Threads * - * The pulseaudio client libraries are not designed to be used in a + * The PulseAudio client libraries are not designed to be used in a * heavily threaded environment. They are however designed to be reentrant * safe. * @@ -102,14 +102,13 @@ * * \section pkgconfig pkg-config * - * The pulseaudio libraries provide pkg-config snippets for the different + * The PulseAudio libraries provide pkg-config snippets for the different * modules: * - * \li pulselib - The asynchronous API and the internal main loop - * implementation. - * \li pulselib-glib12-mainloop - GLIB 1.2 main loop bindings. - * \li pulselib-glib-mainloop - GLIB 2.x main loop bindings. - * \li pulselib-simple - The simple pulseaudio API. + * \li pulselib - The asynchronous API and the internal main loop implementation. + * \li pulselib-mainloop-glib12 - GLIB 1.2 main loop bindings. + * \li pulselib-mainloop-glib - GLIB 2.x main loop bindings. + * \li pulselib-simple - The simple PulseAudio API. */ #endif -- cgit