mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-16 08:56:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'new-world-order'

Browse source 
Conflicts:
	src/Makefile.am
This commit is contained in:
Lennart Poettering 2008-10-25 01:23:02 +02:00
commit 1d978cea85
6 changed files with 302 additions and 548 deletions
Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -32,7 +32,8 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign 1.10 -Wall]) AM_INIT_AUTOMAKE([foreign 1.10 -Wall])
AC_SUBST(PA_MAJORMINOR, "PA_MAJOR.PA_MINOR") AC_SUBST(PA_MAJORMINOR, PA_MAJOR.PA_MINOR)
AC_SUBST(PA_MAJORMINORMICRO, PA_MAJOR.PA_MINOR.PA_MICRO)
AC_SUBST(PACKAGE_URL, [http://pulseaudio.org/]) AC_SUBST(PACKAGE_URL, [http://pulseaudio.org/])
AC_SUBST(PA_API_VERSION, 12) AC_SUBST(PA_API_VERSION, 12)
@ -54,11 +55,6 @@ AC_SUBST(LIBPULSE_BROWSE_VERSION_INFO, [1:1:1])
# info x:y:z always will hold y=z # info x:y:z always will hold y=z
AC_SUBST(LIBPULSE_MAINLOOP_GLIB_VERSION_INFO, [0:4:0]) AC_SUBST(LIBPULSE_MAINLOOP_GLIB_VERSION_INFO, [0:4:0])
# An internally used, ABI-unstable library that contains the
# PulseAudio core, SONAMEs are bumped on every release, version info
# suffix will always be 0:0
AC_SUBST(LIBPULSECORE_VERSION_INFO, [8:0:0])
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_DEFINE_UNQUOTED([CANONICAL_HOST], "$host", [Canonical host string.]) AC_DEFINE_UNQUOTED([CANONICAL_HOST], "$host", [Canonical host string.])
@ -1135,8 +1131,8 @@ fi
AC_ARG_WITH( AC_ARG_WITH(
[module-dir], [module-dir],
AS_HELP_STRING([--with-module-dir],[Directory where to install the modules to (defaults to ${libdir}/pulse-${PA_MAJORMINOR}/modules/]), AS_HELP_STRING([--with-module-dir],[Directory where to install the modules to (defaults to ${libdir}/pulse-${PA_MAJORMINORMICRO}/modules/]),
[modlibexecdir=$withval], [modlibexecdir="${libdir}/pulse-${PA_MAJORMINOR}/modules/"]) [modlibexecdir=$withval], [modlibexecdir="${libdir}/pulse-${PA_MAJORMINORMICRO}/modules/"])
AC_SUBST(modlibexecdir) AC_SUBST(modlibexecdir)

9
libpulse-browse.pc.in
View file

@ -1,11 +1,12 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=${prefix} exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=${prefix}/include includedir=@includedir@
Name: libpulse-browse Name: libpulse-browse
Description: PulseAudio Network Browsing API Description: PulseAudio Network Browsing Interface
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lpulse-browse @PTHREAD_LIBS@ Libs: -L${libdir} -lpulse-browse @PTHREAD_LIBS@
Cflags: -D_REENTRANT -I${includedir} Libs.private: -lpulsecommon-@PA_MAJORMINORMICRO@
Cflags: -I${includedir} -D_REENTRANT
Requires: libpulse Requires: libpulse

9
libpulse-mainloop-glib.pc.in
View file

@ -1,11 +1,12 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=${prefix} exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=${prefix}/include includedir=@includedir@
Name: libpulse-mainloop-glib Name: libpulse-mainloop-glib
Description: GLIB 2.0 Main Loop Wrapper for PulseAudio Description: PulseAudio GLib 2.0 Main Loop Wrapper
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lpulse-mainloop-glib @PTHREAD_LIBS@ Libs: -L${libdir} -lpulse-mainloop-glib @PTHREAD_LIBS@
Cflags: -D_REENTRANT -I${includedir} Libs.private: -lpulsecommon-@PA_MAJORMINORMICRO@
Cflags: -I${includedir} -D_REENTRANT
Requires: libpulse glib-2.0 Requires: libpulse glib-2.0

9
libpulse-simple.pc.in
View file

@ -1,11 +1,12 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=${prefix} exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=${prefix}/include includedir=@includedir@
Name: libpulse-simple Name: libpulse-simple
Description: Simplified Synchronous Client Interface to PulseAudio Description: PulseAudio Simplified Synchronous Client Interface
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lpulse-simple @PTHREAD_LIBS@ Libs: -L${libdir} -lpulse-simple @PTHREAD_LIBS@
Cflags: -D_REENTRANT -I${includedir} Libs.private: -lpulsecommon-@PA_MAJORMINORMICRO@
Cflags: -I${includedir} -D_REENTRANT
Requires: libpulse Requires: libpulse

9
libpulse.pc.in
View file

@ -1,10 +1,11 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=${prefix} exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=${prefix}/include includedir=@includedir@
Name: libpulse Name: libpulse
Description: Client Interface to PulseAudio Description: PulseAudio Client Interface
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lpulse @PTHREAD_LIBS@ Libs: -L${libdir} -lpulse @PTHREAD_LIBS@
Cflags: -D_REENTRANT -I${includedir} Libs.private: -lpulsecommon-@PA_MAJORMINORMICRO@
Cflags: -I${includedir} -D_REENTRANT

802
src/Makefile.am
View file

File diff suppressed because it is too large Load diff