diff options
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index fc478037..ceafdf79 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -308,6 +308,16 @@ TESTS_BINARIES += \ mainloop-test-glib endif +if HAVE_GTK20 +TESTS_BINARIES += \ + gtk-test +endif + +if HAVE_ALSA +TESTS_BINARIES += \ + alsa-time-test +endif + if BUILD_TESTS_DEFAULT noinst_PROGRAMS = $(TESTS_BINARIES) else @@ -504,6 +514,16 @@ prioq_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecomm prioq_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS) prioq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS) +gtk_test_SOURCES = tests/gtk-test.c +gtk_test_LDADD = $(AM_LDADD) libpulse.la libpulse-mainloop-glib.la +gtk_test_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS) +gtk_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(GTK20_LIBS) + +alsa_time_test_SOURCES = tests/alsa-time-test.c +alsa_time_test_LDADD = $(AM_LDADD) +alsa_time_test_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS) +alsa_time_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(ASOUNDLIB_LIBS) + ################################### # Common library # ################################### @@ -571,6 +591,9 @@ libpulsecommon_@PA_MAJORMINORMICRO@_la_CFLAGS = $(AM_CFLAGS) libpulsecommon_@PA_MAJORMINORMICRO@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version libpulsecommon_@PA_MAJORMINORMICRO@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) +# proplist-util.h uses these header files, but not the library itself! +libpulsecommon_@PA_MAJORMINORMICRO@_la_CFLAGS += $(GLIB20_CFLAGS) $(GTK20_CFLAGS) + ## Please note that libpulsecommon implicitly also depends on< ## libpulse! i.e. we have a cyclic dependancy here. Which is intended ## since libpulse only includes stable, official APIs, while @@ -937,7 +960,8 @@ if HAVE_X11 modlibexec_LTLIBRARIES += \ module-x11-bell.la \ module-x11-publish.la \ - module-x11-xsmp.la + module-x11-xsmp.la \ + module-x11-cork-request.la endif if HAVE_OSS @@ -946,6 +970,8 @@ modlibexec_LTLIBRARIES += \ module-oss.la endif +pulselibexec_PROGRAMS = + if HAVE_ALSA modlibexec_LTLIBRARIES += \ libalsa-util.la \ @@ -981,8 +1007,6 @@ modlibexec_LTLIBRARIES += \ module-jack-source.la endif -pulselibexec_PROGRAMS = - if HAVE_GCONF modlibexec_LTLIBRARIES += \ module-gconf.la @@ -1059,6 +1083,7 @@ SYMDEF_FILES = \ modules/module-x11-bell-symdef.h \ modules/module-x11-publish-symdef.h \ modules/module-x11-xsmp-symdef.h \ + modules/module-x11-cork-request-symdef.h \ modules/oss/module-oss-symdef.h \ modules/alsa/module-alsa-sink-symdef.h \ modules/alsa/module-alsa-source-symdef.h \ @@ -1247,6 +1272,11 @@ module_x11_xsmp_la_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS) module_x11_xsmp_la_LDFLAGS = $(MODULE_LDFLAGS) module_x11_xsmp_la_LIBADD = $(AM_LIBADD) $(X11_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la +module_x11_cork_request_la_SOURCES = modules/module-x11-cork-request.c +module_x11_cork_request_la_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS) +module_x11_cork_request_la_LDFLAGS = $(MODULE_LDFLAGS) +module_x11_cork_request_la_LIBADD = $(AM_LIBADD) $(X11_LIBS) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la + # OSS liboss_util_la_SOURCES = modules/oss/oss-util.c modules/oss/oss-util.h |