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

diff --git a/Makefile.am b/Makefile.am
index 4174a39b1c5784c5c51ce600bbce3fcc67a6cfc1..8a0eaf497769c38a893b19f1507795c504e75b05 100644 (file)
--- 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 4f530347f8cd41aac8e62264022d86fd21e491db..bb72ee373d53ec0126f5c8cd69d2bcf66d203ee4 100644 (file)
--- 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-mainloop-glib.pc.in
similarity index 90%
rename from libpulse-glib-mainloop.pc.in
rename to libpulse-mainloop-glib.pc.in
index 169910ba14062d8139daf27a0c310351cb09a5f1..a9a51cf7e2566ad9ef56a2d59739b5fc6f769f3b 100644 (file)
--- a/libpulse-glib-mainloop.pc.in
+++ b/libpulse-mainloop-glib.pc.in
@@ -3,7 +3,7 @@ exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
-Name: libpulse-glib-mainloop
+Name: libpulse-mainloop-glib
 Description: GLIB 2.0 Main Loop Wrapper for PulseAudio
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lpulse-mainloop-glib

diff --git a/libpulse-glib12-mainloop.pc.in b/libpulse-mainloop-glib12.pc.in
similarity index 90%
rename from libpulse-glib12-mainloop.pc.in
rename to libpulse-mainloop-glib12.pc.in
index f525c370d6b55ab88d8475fad3cbcbc9a2443b52..7a03882602a6d6e264afc58e736153fb7bea0f77 100644 (file)
--- a/libpulse-glib12-mainloop.pc.in
+++ b/libpulse-mainloop-glib12.pc.in
@@ -3,7 +3,7 @@ exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
-Name: libpulse-glib12-mainloop
+Name: libpulse-mainloop-glib12
 Description: GLIB 1.2 Main Loop Wrapper for PulseAudio
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lpulse-mainloop-glib12

diff --git a/src/pulse/pulseaudio.h b/src/pulse/pulseaudio.h
index 5c526dc70488883331bbfe9c6bfb638c2b63ce00..71262eaa8588f3d1be478038673c56a2d1305134 100644 (file)
--- a/src/pulse/pulseaudio.h
+++ b/src/pulse/pulseaudio.h
@@ -44,7 +44,7 @@
 #include <pulse/timeval.h>
 
 /** \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