mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

add version number to library names

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@190 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2004-09-11 00:03:00 +00:00
parent 25123469d5
commit 11f0aae5d6
9 changed files with 53 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -25,6 +25,7 @@ AC_CONFIG_SRCDIR([polyp/main.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign -Wall]) AM_INIT_AUTOMAKE([foreign -Wall])
AC_SUBST(PA_MAJORMINOR, "$PACKAGE_VERSION")
AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/polypaudio/]) AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/polypaudio/])
if type -p stow > /dev/null && test -d /usr/local/stow ; then if type -p stow > /dev/null && test -d /usr/local/stow ; then

1
doc/todo
View file

@ -15,7 +15,6 @@
- keep volume in xmms-polyp (and allow volume changing when not playing) - keep volume in xmms-polyp (and allow volume changing when not playing)
- lazy sample cache - lazy sample cache
- per-channel volume - per-channel volume
- add version number to library names
- extend pa_usec_t to 64 bit - extend pa_usec_t to 64 bit
- make use of network latency in all apps - make use of network latency in all apps
- rename streams/contexts - rename streams/contexts

88
polyp/Makefile.am
View file

@ -20,10 +20,12 @@
polypincludedir=$(includedir)/polyp polypincludedir=$(includedir)/polyp
polypconfdir=$(sysconfdir)/polyp polypconfdir=$(sysconfdir)/polyp
modlibdir=$(libdir)/polypaudio-@PA_MAJORMINOR@
AM_CFLAGS=-D_GNU_SOURCE -I$(top_srcdir) $(PTHREAD_CFLAGS) AM_CFLAGS=-D_GNU_SOURCE -I$(top_srcdir) $(PTHREAD_CFLAGS)
AM_CFLAGS+= -DDLSEARCHDIR=\"$(pkglibdir)\" AM_CFLAGS+=-DDLSEARCHDIR=\"$(modlibdir)\"
AM_CFLAGS+="-DDEFAULT_CONFIG_FILE=\"$(polypconfdir)/polypaudio.pa\"" AM_CFLAGS+=-DDEFAULT_CONFIG_FILE=\"$(polypconfdir)/polypaudio.pa\"
AM_CFLAGS+="-DPOLYPAUDIO_BINARY=\"$(bindir)/polypaudio\"" AM_CFLAGS+=-DPOLYPAUDIO_BINARY=\"$(bindir)/polypaudio\"
AM_LDADD=$(PTHREAD_LIBS) -lm AM_LDADD=$(PTHREAD_LIBS) -lm
AM_LIBADD=$(PTHREAD_LIBS) -lm AM_LIBADD=$(PTHREAD_LIBS) -lm
@ -55,7 +57,7 @@ polypinclude_HEADERS=polyplib.h \
sample.h \ sample.h \
glib-mainloop.h glib-mainloop.h
pkglib_LTLIBRARIES=libiochannel.la \ modlib_LTLIBRARIES=libiochannel.la \
libsocket-server.la \ libsocket-server.la \
libsocket-client.la \ libsocket-client.la \
libpstream.la \ libpstream.la \
@ -92,15 +94,15 @@ pkglib_LTLIBRARIES=libiochannel.la \
module-sine.la module-sine.la
if !X_DISPLAY_MISSING if !X_DISPLAY_MISSING
pkglib_LTLIBRARIES+=module-x11-bell.la modlib_LTLIBRARIES+=module-x11-bell.la
endif endif
lib_LTLIBRARIES=libpolyp.la \ lib_LTLIBRARIES=libpolyp-@PA_MAJORMINOR@.la \
libpolyp-error.la \ libpolyp-error-@PA_MAJORMINOR@.la \
libpolyp-mainloop.la \ libpolyp-mainloop-@PA_MAJORMINOR@.la \
libpolyp-mainloop-glib.la \ libpolyp-mainloop-glib-@PA_MAJORMINOR@.la \
libpolyp-mainloop-glib12.la \ libpolyp-mainloop-glib12-@PA_MAJORMINOR@.la \
libpolyp-simple.la libpolyp-simple-@PA_MAJORMINOR@.la
polypaudio_SOURCES = idxset.c idxset.h \ polypaudio_SOURCES = idxset.c idxset.h \
queue.c queue.h \ queue.c queue.h \
@ -307,7 +309,7 @@ module_x11_bell_la_LDFLAGS = -module -avoid-version
module_x11_bell_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIB) module_x11_bell_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIB)
endif endif
libpolyp_la_SOURCES = polyplib.h \ libpolyp_@PA_MAJORMINOR@_la_SOURCES = polyplib.h \
polyplib-def.h \ polyplib-def.h \
tagstruct.c tagstruct.h \ tagstruct.c tagstruct.h \
iochannel.c iochannel.h \ iochannel.c iochannel.h \
@ -340,71 +342,71 @@ libpolyp_la_SOURCES = polyplib.h \
log.c log.h \ log.c log.h \
gcc-printf.h gcc-printf.h
libpolyp_la_CFLAGS = $(AM_CFLAGS) libpolyp_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
libpolyp_la_LDFLAGS = -version-info 0:0:0 libpolyp_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
libpolyp_mainloop_la_SOURCES = mainloop-api.h mainloop-api.c \ libpolyp_mainloop_@PA_MAJORMINOR@_la_SOURCES = mainloop-api.h mainloop-api.c \
mainloop.c mainloop.h \ mainloop.c mainloop.h \
mainloop-signal.c mainloop-signal.h mainloop-signal.c mainloop-signal.h
libpolyp_mainloop_la_CFLAGS = $(AM_CFLAGS) libpolyp_mainloop_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
libpolyp_mainloop_la_LIBADD = $(AM_LIBADD) libpolyp.la libpolyp_mainloop_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la
libpolyp_mainloop_la_LDFLAGS = -version-info 0:0:0 libpolyp_mainloop_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
libpolyp_error_la_SOURCES = polyplib-error.c polyplib-error.h libpolyp_error_@PA_MAJORMINOR@_la_SOURCES = polyplib-error.c polyplib-error.h
libpolyp_error_la_CFLAGS = $(AM_CFLAGS) libpolyp_error_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
libpolyp_error_la_LIBADD = $(AM_LIBADD) libpolyp.la libpolyp_error_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la
libpolyp_error_la_LDFLAGS = -version-info 0:0:0 libpolyp_error_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
libpolyp_simple_la_SOURCES = polyplib-simple.c polyplib-simple.h libpolyp_simple_@PA_MAJORMINOR@_la_SOURCES = polyplib-simple.c polyplib-simple.h
libpolyp_simple_la_CFLAGS = $(AM_CFLAGS) libpolyp_simple_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
libpolyp_simple_la_LIBADD = $(AM_LIBADD) libpolyp.la libpolyp-mainloop.la libpolyp_simple_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
libpolyp_simple_la_LDFLAGS = -version-info 0:0:0 libpolyp_simple_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
libpolyp_mainloop_glib_la_SOURCES = glib-mainloop.h glib-mainloop.c libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_SOURCES = glib-mainloop.h glib-mainloop.c
libpolyp_mainloop_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS) libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
libpolyp_mainloop_glib_la_LIBADD = $(AM_LIBADD) libpolyp-mainloop.la $(GLIB20_LIBS) libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-mainloop-@PA_MAJORMINOR@.la $(GLIB20_LIBS)
libpolyp_mainloop_glib_la_LDFLAGS = -version-info 0:0:0 libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
libpolyp_mainloop_glib12_la_SOURCES = glib-mainloop.h glib12-mainloop.c libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_SOURCES = glib-mainloop.h glib12-mainloop.c
libpolyp_mainloop_glib12_la_CFLAGS = $(AM_CFLAGS) $(GLIB12_CFLAGS) libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(GLIB12_CFLAGS)
libpolyp_mainloop_glib12_la_LIBADD = $(AM_LIBADD) libpolyp-mainloop.la $(GLIB12_LIBS) libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-mainloop-@PA_MAJORMINOR@.la $(GLIB12_LIBS)
libpolyp_mainloop_glib12_la_LDFLAGS = -version-info 0:0:0 libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
pacat_SOURCES = pacat.c pacat_SOURCES = pacat.c
pacat_LDADD = $(AM_LDADD) libpolyp.la libpolyp-error.la libpolyp-mainloop.la pacat_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
pacat_CFLAGS = $(AM_CFLAGS) pacat_CFLAGS = $(AM_CFLAGS)
pactl_SOURCES = pactl.c pactl_SOURCES = pactl.c
pactl_LDADD = $(AM_LDADD) libpolyp.la libpolyp-error.la libpolyp-mainloop.la $(LIBSNDFILE_LIBS) pactl_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
pactl_CFLAGS = $(AM_CFLAGS) $(LIBSDNFILE_CFLAGS) pactl_CFLAGS = $(AM_CFLAGS) $(LIBSDNFILE_CFLAGS)
pacat_simple_SOURCES = pacat-simple.c pacat_simple_SOURCES = pacat-simple.c
pacat_simple_LDADD = $(AM_LDADD) libpolyp.la libpolyp-simple.la libpolyp-error.la pacat_simple_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-simple-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la
pacat_simple_CFLAGS = $(AM_CFLAGS) pacat_simple_CFLAGS = $(AM_CFLAGS)
parec_simple_SOURCES = parec-simple.c parec_simple_SOURCES = parec-simple.c
parec_simple_LDADD = $(AM_LDADD) libpolyp.la libpolyp-simple.la libpolyp-error.la parec_simple_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-simple-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la
parec_simple_CFLAGS = $(AM_CFLAGS) parec_simple_CFLAGS = $(AM_CFLAGS)
mainloop_test_SOURCES = mainloop-test.c mainloop_test_SOURCES = mainloop-test.c
mainloop_test_CFLAGS = $(AM_CFLAGS) mainloop_test_CFLAGS = $(AM_CFLAGS)
mainloop_test_LDADD = $(AM_LDADD) libpolyp-mainloop.la libpolyp.la mainloop_test_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la libpolyp-@PA_MAJORMINOR@.la
mainloop_test_glib_SOURCES = $(mainloop_test_SOURCES) mainloop_test_glib_SOURCES = $(mainloop_test_SOURCES)
mainloop_test_glib_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB20_CFLAGS) -DGLIB_MAIN_LOOP mainloop_test_glib_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB20_CFLAGS) -DGLIB_MAIN_LOOP
mainloop_test_glib_LDADD = $(mainloop_test_LDADD) $(GLIB20_LIBS) libpolyp-mainloop-glib.la mainloop_test_glib_LDADD = $(mainloop_test_LDADD) $(GLIB20_LIBS) libpolyp-mainloop-glib-@PA_MAJORMINOR@.la
mainloop_test_glib12_SOURCES = $(mainloop_test_SOURCES) mainloop_test_glib12_SOURCES = $(mainloop_test_SOURCES)
mainloop_test_glib12_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB12_CFLAGS) -DGLIB_MAIN_LOOP mainloop_test_glib12_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB12_CFLAGS) -DGLIB_MAIN_LOOP
mainloop_test_glib12_LDADD = $(mainloop_test_LDADD) $(GLIB12_LIBS) libpolyp-mainloop-glib12.la mainloop_test_glib12_LDADD = $(mainloop_test_LDADD) $(GLIB12_LIBS) libpolyp-mainloop-glib12-@PA_MAJORMINOR@.la
cpulimit_test_SOURCES = cpulimit-test.c cpulimit.c util.c log.c cpulimit_test_SOURCES = cpulimit-test.c cpulimit.c util.c log.c
cpulimit_test_CFLAGS = $(AM_CFLAGS) cpulimit_test_CFLAGS = $(AM_CFLAGS)
cpulimit_test_LDADD = $(AM_LDADD) libpolyp-mainloop.la cpulimit_test_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la
cpulimit_test2_SOURCES = cpulimit-test.c cpulimit.c util.c log.c cpulimit_test2_SOURCES = cpulimit-test.c cpulimit.c util.c log.c
cpulimit_test2_CFLAGS = $(AM_CFLAGS) -DTEST2 cpulimit_test2_CFLAGS = $(AM_CFLAGS) -DTEST2
cpulimit_test2_LDADD = $(AM_LDADD) libpolyp-mainloop.la cpulimit_test2_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la
if BUILD_LIBPOLYPCORE if BUILD_LIBPOLYPCORE

2
polyplib-error.pc.in
View file

@ -6,5 +6,5 @@ includedir=${prefix}/include
Name: polyplib-error Name: polyplib-error
Description: Error library for the polypaudio sound daemon Description: Error library for the polypaudio sound daemon
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lpolyp-error Libs: -L${libdir} -lpolyp-error-@PA_MAJORMINOR@
Cflags: -D_REENTRANT -I${includedir} Cflags: -D_REENTRANT -I${includedir}

2
polyplib-glib-mainloop.pc.in
View file

@ -6,6 +6,6 @@ includedir=${prefix}/include
Name: polyplib-glib-mainloop Name: polyplib-glib-mainloop
Description: GLIB main loop wrapper for polypaudio Description: GLIB main loop wrapper for polypaudio
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lpolyp-mainloop-glib Libs: -L${libdir} -lpolyp-mainloop-glib-@PA_MAJORMINOR@
Cflags: -D_REENTRANT -I${includedir} Cflags: -D_REENTRANT -I${includedir}
Requires: polyplib-mainloop Requires: polyplib-mainloop

4
polyplib-glib12-mainloop.pc.in
View file

@ -3,9 +3,9 @@ exec_prefix=${prefix}
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
includedir=${prefix}/include includedir=${prefix}/include
Name: polyplib-glib-mainloop Name: polyplib-glib12-mainloop
Description: GLIB main loop wrapper for polypaudio Description: GLIB main loop wrapper for polypaudio
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lpolyp-mainloop-glib12 Libs: -L${libdir} -lpolyp-mainloop-glib12-@PA_MAJORMINOR@
Cflags: -D_REENTRANT -I${includedir} Cflags: -D_REENTRANT -I${includedir}
Requires: polyplib-mainloop Requires: polyplib-mainloop

2
polyplib-mainloop.pc.in
View file

@ -6,5 +6,5 @@ includedir=${prefix}/include
Name: polyplib-mainloop Name: polyplib-mainloop
Description: Main loop support for polypaudio Description: Main loop support for polypaudio
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lpolyp-mainloop Libs: -L${libdir} -lpolyp-mainloop-@PA_MAJORMINOR@
Cflags: -D_REENTRANT -I${includedir} Cflags: -D_REENTRANT -I${includedir}

2
polyplib-simple.pc.in
View file

@ -6,6 +6,6 @@ includedir=${prefix}/include
Name: polyplib-simple Name: polyplib-simple
Description: Simplified synchronous client interface to polypaudio Description: Simplified synchronous client interface to polypaudio
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lpolyp-simple Libs: -L${libdir} -lpolyp-simple-@PA_MAJORMINOR@
Cflags: -D_REENTRANT -I${includedir} Cflags: -D_REENTRANT -I${includedir}
Requires: polyplib polyplib-mainloop polyplib-error Requires: polyplib polyplib-mainloop polyplib-error

2
polyplib.pc.in
View file

@ -6,6 +6,6 @@ includedir=${prefix}/include
Name: polyplib Name: polyplib
Description: Client interface to polypaudio Description: Client interface to polypaudio
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lpolyp Libs: -L${libdir} -lpolyp-@PA_MAJORMINOR@
Cflags: -D_REENTRANT -I${includedir} Cflags: -D_REENTRANT -I${includedir}
Requires: polyplib-error polyplib-mainloop Requires: polyplib-error polyplib-mainloop