prepare for release

[pulseaudio] / polyp / Makefile.am

diff --git a/polyp/Makefile.am b/polyp/Makefile.am
index c4f9e2d26b7bda253d3539859641ee28546f94ca..8c91ae4bf4bc2fa2f0ea403a2d3a1375b62ebac4 100644 (file)
--- a/polyp/Makefile.am
+++ b/polyp/Makefile.am
@@ -3,7 +3,7 @@
 # This file is part of polypaudio.
 #
 # polypaudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
+# it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
@@ -12,7 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 # General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU Lesser General Public License
 # along with polypaudio; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
@@ -27,12 +27,22 @@ AM_CFLAGS+=-DDLSEARCHPATH=\"$(modlibdir)\"
 AM_CFLAGS+=-DDEFAULT_CONFIG_DIR=\"$(polypconfdir)\"
 AM_CFLAGS+=-DPOLYPAUDIO_BINARY=\"$(bindir)/polypaudio\"
 
+# This cool debug trap works on i386/gcc only
+AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
+
 AM_LIBADD=$(PTHREAD_LIBS) -lm
 AM_LDADD=$(PTHREAD_LIBS) -lm
 
 EXTRA_DIST = default.pa.in daemon.conf.in client.conf.in depmod.py esdcompat.sh.in module-defs.h.m4
-bin_PROGRAMS = polypaudio pacat pactl paplay
+bin_PROGRAMS = \
+               polypaudio \
+               pacat \
+               pactl \
+               paplay \
+               pacmd
+
 bin_SCRIPTS = esdcompat.sh
+
 noinst_PROGRAMS = \
                mainloop-test \
                pacat-simple \
@@ -40,7 +50,8 @@ noinst_PROGRAMS = \
                cpulimit-test \
                cpulimit-test2 \
                voltest \
-               strlist-test
+               strlist-test \
+               mcalign-test
 
 polypconf_DATA=default.pa daemon.conf client.conf
 
@@ -115,7 +126,8 @@ modlib_LTLIBRARIES= \
                module-match.la \
                module-tunnel-sink.la \
                module-tunnel-source.la \
-               module-null-sink.la
+               module-null-sink.la \
+               module-esound-sink.la
 
 SYMDEF_FILES= \
                module-cli-symdef.h \
@@ -143,7 +155,8 @@ SYMDEF_FILES= \
                module-match-symdef.h \
                module-tunnel-sink-symdef.h \
                module-tunnel-source-symdef.h \
-               module-null-sink-symdef.h
+               module-null-sink-symdef.h \
+               module-esound-sink-symdef.h
 
 EXTRA_DIST+=$(SYMDEF_FILES)
 BUILT_SOURCES+=$(SYMDEF_FILES)
@@ -194,7 +207,6 @@ polypaudio_SOURCES = idxset.c idxset.h \
                autoload.c autoload.h \
                xmalloc.c xmalloc.h \
                subscribe.h subscribe.c \
-               debug.h \
                sound-file-stream.c sound-file-stream.h \
                cpulimit.c cpulimit.h \
                log.c log.h \
@@ -204,13 +216,15 @@ polypaudio_SOURCES = idxset.c idxset.h \
                dumpmodules.c dumpmodules.h \
                conf-parser.h conf-parser.c \
                caps.h caps.c \
-               props.h props.c
+               props.h props.c \
+               mcalign.c mcalign.h \
+               g711.c g711.h \
+               pid.c pid.h
 
 polypaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS)
-polypaudio_INCLUDES = $(INCLTDL)
+polypaudio_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
 polypaudio_LDADD = $(AM_LDADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS)
-polypaudio_LDFLAGS= -export-dynamic -dlopen force
-# -static $(foreach f,$(modlib_LTLIBRARIES),-dlpreopen $(f))
+polypaudio_LDFLAGS= $(AM_LDFLAGS) -export-dynamic -dlopen force #-static $(foreach f,$(modlib_LTLIBRARIES),-dlpreopen $(f))
 
 libprotocol_simple_la_SOURCES = protocol-simple.c protocol-simple.h
 libprotocol_simple_la_LDFLAGS = -avoid-version
@@ -400,6 +414,10 @@ module_esound_compat_spawnpid_la_SOURCES = module-esound-compat-spawnpid.c
 module_esound_compat_spawnpid_la_LDFLAGS = -module -avoid-version
 module_esound_compat_spawnpid_la_LIBADD = $(AM_LIBADD)
 
+module_esound_sink_la_SOURCES = module-esound-sink.c
+module_esound_sink_la_LDFLAGS = -module -avoid-version
+module_esound_sink_la_LIBADD = $(AM_LIBADD) libsocket-client.la libauthkey.la
+
 libpolyp_@PA_MAJORMINOR@_la_SOURCES = polyplib.h \
                polyplib-def.h \
                tagstruct.c tagstruct.h \
@@ -435,7 +453,8 @@ libpolyp_@PA_MAJORMINOR@_la_SOURCES = polyplib.h \
                client-conf.c client-conf.h \
                conf-parser.c conf-parser.h \
                strlist.c strlist.h \
-               strbuf.c strbuf.h
+               strbuf.c strbuf.h \
+               mcalign.c mcalign.h
 
 libpolyp_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
 libpolyp_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
@@ -489,6 +508,14 @@ strlist_test_SOURCES = strlist-test.c strlist.c strlist.h strbuf.c strbuf.h util
 strlist_test_CFLAGS = $(AM_CFLAGS)
 strlist_test_LDADD = $(AM_LDADD)
 
+mcalign_test_SOURCES = mcalign-test.c util.c util.h xmalloc.c xmalloc.h log.c log.h mcalign.c mcalign.h memchunk.c memchunk.h memblock.c memblock.h
+mcalign_test_CFLAGS = $(AM_CFLAGS)
+mcalign_test_LDADD = $(AM_LDADD)
+
+pacmd_SOURCES = pacmd.c util.c util.h xmalloc.c xmalloc.h log.c log.h pid.c pid.h
+pacmd_CFLAGS = $(AM_CFLAGS)
+pacmd_LDADD = $(AM_LDADD)
+
 cpulimit_test_SOURCES = cpulimit-test.c cpulimit.c util.c log.c cpulimit.h util.h log.h
 cpulimit_test_CFLAGS = $(AM_CFLAGS)
 cpulimit_test_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la
@@ -538,7 +565,7 @@ pax11publish_LDADD = $(AM_LDADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
 
 libpolyp_@PA_MAJORMINOR@_la_CFLAGS += $(X_CFLAGS)
 libpolyp_@PA_MAJORMINOR@_la_LDFLAGS += $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
-libpolyp_@PA_MAJORMINOR@_la_SOURCES += x11prop.c client-conf-x11.c
+libpolyp_@PA_MAJORMINOR@_la_SOURCES += x11prop.c x11prop.h client-conf-x11.c client-conf-x11.h
 
 endif
 
@@ -704,6 +731,7 @@ daemon.conf: daemon.conf.in Makefile
 install-exec-hook:
        chown root $(DESTDIR)$(bindir)/polypaudio
        chmod u+s $(DESTDIR)$(bindir)/polypaudio
+       ln -s pacat $(DESTDIR)$(bindir)/parec
 
 $(SYMDEF_FILES): module-defs.h.m4
        $(M4) -Dfname="$@" $< > $@