# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
-AM_CFLAGS=-ansi -D_GNU_SOURCE -DDLSEARCHDIR=\"$(pkglibdir)\" -I$(srcdir)/..
-AM_LDADD=-L.
-AM_LIBADD=-L.
+AM_CFLAGS=-D_GNU_SOURCE -I$(top_srcdir) $(PTHREAD_CFLAGS)
+#AM_CFLAGS+= -DDLSEARCHDIR=\"$(pkglibdir)\"
+AM_LDADD=$(PTHREAD_LIBS)
+AM_LIBADD=$(PTHREAD_LIBS)
polypincludedir=$(includedir)/polyp
EXTRA_DIST = polypaudio.pa depmod.py
bin_PROGRAMS = polypaudio pacat pactl
-noinst_PROGRAMS = pacat-simple parec-simple glib-test
+noinst_PROGRAMS = mainloop-test mainloop-test-glib mainloop-test-glib12 pacat-simple parec-simple
+
+BUILT_SOURCES=polyplib-version.h
polypinclude_HEADERS=polyplib.h \
polyplib-def.h \
polyplib-simple.h \
polyplib-error.h \
+ polyplib-stream.h \
+ polyplib-context.h \
+ polyplib-introspect.h \
+ polyplib-subscribe.h \
+ polyplib-operation.h \
+ polyplib-scache.h \
+ polyplib-version.h \
+ cdecl.h \
mainloop-api.h \
mainloop.h \
mainloop-signal.h \
module-esound-protocol-tcp.la \
module-esound-protocol-unix.la \
module-native-protocol-tcp.la \
- module-native-protocol-unix.la \
- module-x11-bell.la
+ module-native-protocol-unix.la
+
+if !X_DISPLAY_MISSING
+pkglib_LTLIBRARIES+=module-x11-bell.la
+endif
lib_LTLIBRARIES=libpolyp.la \
- libpolyp-simple.la \
libpolyp-error.la \
libpolyp-mainloop.la \
- libpolyp-mainloop-glib.la
+ libpolyp-mainloop-glib.la \
+ libpolyp-mainloop-glib12.la \
+ libpolyp-simple.la
polypaudio_SOURCES = idxset.c idxset.h \
queue.c queue.h \
modargs.c modargs.h \
cmdline.c cmdline.h \
cli-command.c cli-command.h \
- clitext.c clitext.h \
+ cli-text.c cli-text.h \
tokenizer.c tokenizer.h \
dynarray.c dynarray.h \
scache.c scache.h \
sound-file.c sound-file.h \
play-memchunk.c play-memchunk.h \
autoload.c autoload.h \
- xmalloc.c xmalloc.h
+ xmalloc.c xmalloc.h \
+ subscribe.h subscribe.c \
+ debug.h
polypaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS)
polypaudio_INCLUDES = $(INCLTDL)
module_cli_la_LDFLAGS = -module -avoid-version
module_cli_la_LIBADD = $(AM_LIBADD) libcli.la libiochannel.la
+if !X_DISPLAY_MISSING
module_x11_bell_la_SOURCES = module-x11-bell.c
+module_x11_bell_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
module_x11_bell_la_LDFLAGS = -module -avoid-version
-module_x11_bell_la_LIBADD = $(AM_LIBADD) -lX11 -L/usr/X11R6/lib
+module_x11_bell_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIB)
+endif
-libpolyp_la_SOURCES = polyplib.c polyplib.h \
+libpolyp_la_SOURCES = polyplib.h \
polyplib-def.h \
tagstruct.c tagstruct.h \
iochannel.c iochannel.h \
socket-util.c socket-util.h \
native-common.h \
sample.c sample.h \
- xmalloc.c xmalloc.h
+ xmalloc.c xmalloc.h \
+ polyplib-operation.c polyplib-operation.h \
+ polyplib-context.c polyplib-context.h \
+ polyplib-stream.c polyplib-stream.h \
+ polyplib-introspect.c polyplib-introspect.h \
+ polyplib-scache.c polyplib-scache.h \
+ polyplib-subscribe.c polyplib-subscribe.h \
+ polyplib-internal.h \
+ cdecl.h \
+ llist.h
libpolyp_la_CFLAGS = $(AM_CFLAGS)
+libpolyp_la_LDFLAGS = -version-info 0:0:0
libpolyp_mainloop_la_SOURCES = mainloop-api.h mainloop-api.c \
mainloop.c mainloop.h \
mainloop-signal.c mainloop-signal.h
libpolyp_mainloop_la_CFLAGS = $(AM_CFLAGS)
+libpolyp_mainloop_la_LIBADD = $(AM_LIBADD) libpolyp.la
+libpolyp_mainloop_la_LDFLAGS = -version-info 0:0:0
libpolyp_error_la_SOURCES = polyplib-error.c polyplib-error.h
libpolyp_error_la_CFLAGS = $(AM_CFLAGS)
+libpolyp_error_la_LIBADD = $(AM_LIBADD) libpolyp.la
+libpolyp_error_la_LDFLAGS = -version-info 0:0:0
libpolyp_simple_la_SOURCES = polyplib-simple.c polyplib-simple.h
libpolyp_simple_la_CFLAGS = $(AM_CFLAGS)
libpolyp_simple_la_LIBADD = $(AM_LIBADD) libpolyp.la libpolyp-mainloop.la
+libpolyp_simple_la_LDFLAGS = -version-info 0:0:0
+
+libpolyp_mainloop_glib_la_SOURCES = glib-mainloop.h glib-mainloop.c
+libpolyp_mainloop_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
+libpolyp_mainloop_glib_la_LIBADD = $(AM_LIBADD) libpolyp-mainloop.la $(GLIB20_LIBS)
+libpolyp_mainloop_glib_la_LDFLAGS = -version-info 0:0:0
+
+libpolyp_mainloop_glib12_la_SOURCES = glib-mainloop.h glib12-mainloop.c
+libpolyp_mainloop_glib12_la_CFLAGS = $(AM_CFLAGS) $(GLIB12_CFLAGS)
+libpolyp_mainloop_glib12_la_LIBADD = $(AM_LIBADD) libpolyp-mainloop.la $(GLIB12_LIBS)
+libpolyp_mainloop_glib12_la_LDFLAGS = -version-info 0:0:0
pacat_SOURCES = pacat.c
pacat_LDADD = $(AM_LDADD) libpolyp.la libpolyp-error.la libpolyp-mainloop.la
pactl_CFLAGS = $(AM_CFLAGS) $(LIBSDNFILE_CFLAGS)
pacat_simple_SOURCES = pacat-simple.c
-pacat_simple_LDADD = $(AM_LDADD) libpolyp-simple.la libpolyp-error.la
+pacat_simple_LDADD = $(AM_LDADD) libpolyp.la libpolyp-simple.la libpolyp-error.la
pacat_simple_CFLAGS = $(AM_CFLAGS)
parec_simple_SOURCES = parec-simple.c
-parec_simple_LDADD = $(AM_LDADD) libpolyp-simple.la libpolyp-error.la
+parec_simple_LDADD = $(AM_LDADD) libpolyp.la libpolyp-simple.la libpolyp-error.la
parec_simple_CFLAGS = $(AM_CFLAGS)
-libpolyp_mainloop_glib_la_SOURCES = glib-mainloop.h glib-mainloop.c
-libpolyp_mainloop_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
-libpolyp_mainloop_glib_la_LIBADD = $(AM_LIBADD) libpolyp-mainloop.la $(GLIB20_LIBS)
+mainloop_test_SOURCES = mainloop-test.c
+mainloop_test_CFLAGS = $(AM_CFLAGS)
+mainloop_test_LDADD = $(AM_LDADD) libpolyp-mainloop.la libpolyp.la
+
+mainloop_test_glib_SOURCES = $(mainloop_test_SOURCES)
+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
-glib_test_SOURCES = glib-test.c
-glib_test_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
-glib_test_LDADD = $(AM_LDADD) $(GLIB20_LIBS) libpolyp.la libpolyp-mainloop-glib.la
+mainloop_test_glib12_SOURCES = $(mainloop_test_SOURCES)
+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
if BUILD_LIBPOLYPCORE
sioman.c sioman.h \
modargs.c modargs.h \
cli-command.c cli-command.h \
- clitext.c clitext.h \
+ cli-text.c cli-text.h \
tokenizer.c tokenizer.h \
dynarray.c dynarray.h