diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-01-20 00:55:36 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-01-20 00:55:36 +0100 |
| commit | 47a2f9e3da9a66a308f311340410640f2f4cb28f (patch) | |
| tree | 991dbb317db801c8e02c8b372f6ddba8079a9916 /src | |
| parent | d5e895d5cbf9a9a658c66347cb034f1c97133280 (diff) | |
| parent | bc41fdb20d04ad7f42d5ff28f32a9b3ff3ca52f3 (diff) | |
Merge commit 'flameeyes/buildfixes-2'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e8f0a820..17e14be8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -56,6 +56,8 @@ AM_CFLAGS = \ -I$(top_builddir)/src/modules/gconf \ -I$(top_srcdir)/src/modules/bluetooth \ -I$(top_builddir)/src/modules/bluetooth \ + -I$(top_srcdir)/src/modules/alsa \ + -I$(top_builddir)/src/modules/alsa \ -I$(top_srcdir)/src/modules/raop \ $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \ $(LTDLINCL) \ @@ -253,7 +255,7 @@ TESTS = \ lock-autospawn-test \ prioq-test -noinst_PROGRAMS = \ +TESTS_BINARIES = \ mainloop-test \ mcalign-test \ pacat-simple \ @@ -293,7 +295,7 @@ if HAVE_SIGXCPU #TESTS += \ # cpulimit-test \ # cpulimit-test2 -noinst_PROGRAMS += \ +TESTS_BINARIES += \ cpulimit-test \ cpulimit-test2 endif @@ -301,10 +303,16 @@ endif if HAVE_GLIB20 TESTS += \ mainloop-test-glib -noinst_PROGRAMS += \ +TESTS_BINARIES += \ mainloop-test-glib endif +if BUILD_TESTS_DEFAULT +noinst_PROGRAMS = $(TESTS_BINARIES) +else +check_PROGRAMS = $(TESTS_BINARIES) +endif + mainloop_test_SOURCES = tests/mainloop-test.c mainloop_test_CFLAGS = $(AM_CFLAGS) mainloop_test_LDADD = $(AM_LDADD) libpulse.la |