[polypaudio-commits] r546 - in /trunk: Makefile.am configure.ac polyplib-error.pc.in polyplib-mainloop.pc.in src/Makefile.am
svnmailer-noreply at 0pointer.de
svnmailer-noreply at 0pointer.de
Mon Feb 20 16:37:23 PST 2006
Author: lennart
Date: Tue Feb 21 01:37:22 2006
New Revision: 546
URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=546&root=polypaudio&view=rev
Log:
* Get rid of libpolyp-mainloop
* Remove pkg-config file of polyplib-error
Removed:
trunk/polyplib-error.pc.in
trunk/polyplib-mainloop.pc.in
Modified:
trunk/Makefile.am
trunk/configure.ac
trunk/src/Makefile.am
Modified: trunk/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/Makefile.am?rev=546&root=polypaudio&r1=545&r2=546&view=diff
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Tue Feb 21 01:37:22 2006
@@ -24,7 +24,7 @@
noinst_DATA =
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = polyplib.pc polyplib-simple.pc polyplib-error.pc polyplib-mainloop.pc polyplib-browse.pc
+pkgconfig_DATA = polyplib.pc polyplib-simple.pc polyplib-browse.pc
if HAVE_GLIB20
pkgconfig_DATA += \
Modified: trunk/configure.ac
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/configure.ac?rev=546&root=polypaudio&r1=545&r2=546&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Feb 21 01:37:22 2006
@@ -398,9 +398,7 @@
src/Makefile
polyplib.pc
polyplib-simple.pc
-polyplib-mainloop.pc
polyplib-browse.pc
-polyplib-error.pc
polyplib-glib-mainloop.pc
polyplib-glib12-mainloop.pc
doc/Makefile
Modified: trunk/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/Makefile.am?rev=546&root=polypaudio&r1=545&r2=546&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Tue Feb 21 01:37:22 2006
@@ -141,17 +141,17 @@
bin_SCRIPTS = esdcompat.sh
pacat_SOURCES = utils/pacat.c
-pacat_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la libpolyp-mainloop- at PA_MAJORMINOR@.la
+pacat_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la
pacat_CFLAGS = $(AM_CFLAGS)
pacat_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
paplay_SOURCES = utils/paplay.c
-paplay_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la libpolyp-mainloop- at PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
+paplay_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
paplay_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
paplay_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
pactl_SOURCES = utils/pactl.c
-pactl_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la libpolyp-mainloop- at PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
+pactl_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
pactl_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
pactl_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
@@ -166,7 +166,7 @@
pax11publish_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
pabrowse_SOURCES = utils/pabrowse.c
-pabrowse_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la libpolyp-mainloop- at PA_MAJORMINOR@.la libpolyp-browse- at PA_MAJORMINOR@.la
+pabrowse_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la libpolyp-browse- at PA_MAJORMINOR@.la
pabrowse_CFLAGS = $(AM_CFLAGS)
pabrowse_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
@@ -202,7 +202,7 @@
mainloop_test_SOURCES = tests/mainloop-test.c
mainloop_test_CFLAGS = $(AM_CFLAGS)
-mainloop_test_LDADD = $(AM_LDADD) libpolyp-mainloop- at PA_MAJORMINOR@.la libpolyp- at PA_MAJORMINOR@.la
+mainloop_test_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la
mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
mcalign_test_SOURCES = tests/mcalign-test.c
@@ -211,12 +211,12 @@
mcalign_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
pacat_simple_SOURCES = tests/pacat-simple.c
-pacat_simple_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la libpolyp-simple- at PA_MAJORMINOR@.la libpolyp-mainloop- at PA_MAJORMINOR@.la
+pacat_simple_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la libpolyp-simple- at PA_MAJORMINOR@.la
pacat_simple_CFLAGS = $(AM_CFLAGS)
pacat_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
parec_simple_SOURCES = tests/parec-simple.c
-parec_simple_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la libpolyp-simple- at PA_MAJORMINOR@.la libpolyp-mainloop- at PA_MAJORMINOR@.la
+parec_simple_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la libpolyp-simple- at PA_MAJORMINOR@.la
parec_simple_CFLAGS = $(AM_CFLAGS)
parec_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
@@ -232,12 +232,12 @@
cpulimit_test_SOURCES = tests/cpulimit-test.c daemon/cpulimit.c daemon/cpulimit.h
cpulimit_test_CFLAGS = $(AM_CFLAGS)
-cpulimit_test_LDADD = $(AM_LDADD) libpolyp-mainloop- at PA_MAJORMINOR@.la libpolypcore.la
+cpulimit_test_LDADD = $(AM_LDADD) libpolypcore.la
cpulimit_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
cpulimit_test2_SOURCES = tests/cpulimit-test.c daemon/cpulimit.c daemon/cpulimit.h
cpulimit_test2_CFLAGS = $(AM_CFLAGS) -DTEST2
-cpulimit_test2_LDADD = $(AM_LDADD) libpolyp-mainloop- at PA_MAJORMINOR@.la libpolypcore.la
+cpulimit_test2_LDADD = $(AM_LDADD) libpolypcore.la
cpulimit_test2_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
mainloop_test_glib_SOURCES = $(mainloop_test_SOURCES)
@@ -264,7 +264,7 @@
memblockq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
sync_playback_SOURCES = tests/sync-playback.c
-sync_playback_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la libpolyp-mainloop- at PA_MAJORMINOR@.la
+sync_playback_LDADD = $(AM_LDADD) libpolyp- at PA_MAJORMINOR@.la
sync_playback_CFLAGS = $(AM_CFLAGS)
sync_playback_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
@@ -300,7 +300,6 @@
lib_LTLIBRARIES = \
libpolyp- at PA_MAJORMINOR@.la \
- libpolyp-mainloop- at PA_MAJORMINOR@.la \
libpolyp-simple- at PA_MAJORMINOR@.la
if HAVE_HOWL
@@ -336,7 +335,10 @@
polyp/stream.c polyp/stream.h \
polyp/subscribe.c polyp/subscribe.h \
polyp/sample.c polyp/sample.h \
- polyp/volume.c polyp/volume.h
+ polyp/volume.c polyp/volume.h \
+ polyp/mainloop.c polyp/mainloop.h \
+ polyp/mainloop-signal.c polyp/mainloop-signal.h \
+ polypcore/poll.c polypcore/poll.h
# Internal stuff that is shared with libpolypcore
libpolyp_ at PA_MAJORMINOR@_la_SOURCES += \
@@ -393,17 +395,9 @@
libpolyp_ at PA_MAJORMINOR@_la_LIBADD += $(LIBASYNCNS_LIBS)
endif
-libpolyp_mainloop_ at PA_MAJORMINOR@_la_SOURCES = \
- polyp/mainloop.c polyp/mainloop.h \
- polyp/mainloop-signal.c polyp/mainloop-signal.h \
- polypcore/poll.c polypcore/poll.h
-libpolyp_mainloop_ at PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
-libpolyp_mainloop_ at PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp- at PA_MAJORMINOR@.la $(WINSOCK_LIBS)
-libpolyp_mainloop_ at PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
-
libpolyp_simple_ at PA_MAJORMINOR@_la_SOURCES = polyp/simple.c polyp/simple.h
libpolyp_simple_ at PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
-libpolyp_simple_ at PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp- at PA_MAJORMINOR@.la libpolyp-mainloop- at PA_MAJORMINOR@.la
+libpolyp_simple_ at PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp- at PA_MAJORMINOR@.la
libpolyp_simple_ at PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
libpolyp_browse_ at PA_MAJORMINOR@_la_SOURCES = polyp/browser.c polyp/browser.h
@@ -413,12 +407,12 @@
libpolyp_mainloop_glib_ at PA_MAJORMINOR@_la_SOURCES = polyp/glib-mainloop.h polyp/glib-mainloop.c
libpolyp_mainloop_glib_ at PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
-libpolyp_mainloop_glib_ at PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-mainloop- at PA_MAJORMINOR@.la $(GLIB20_LIBS)
+libpolyp_mainloop_glib_ at PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp- at PA_MAJORMINOR@.la $(GLIB20_LIBS)
libpolyp_mainloop_glib_ at PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
libpolyp_mainloop_glib12_ at PA_MAJORMINOR@_la_SOURCES = polyp/glib-mainloop.h polyp/glib12-mainloop.c
libpolyp_mainloop_glib12_ at PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(GLIB12_CFLAGS)
-libpolyp_mainloop_glib12_ at PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-mainloop- at PA_MAJORMINOR@.la $(GLIB12_LIBS)
+libpolyp_mainloop_glib12_ at PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp- at PA_MAJORMINOR@.la $(GLIB12_LIBS)
libpolyp_mainloop_glib12_ at PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
###################################
More information about the pulseaudio-commits
mailing list