Merge commit 'flameeyes/buildfixes-2'

This commit is contained in:
Lennart Poettering 2009-01-20 00:55:36 +01:00
commit 47a2f9e3da
2 changed files with 17 additions and 3 deletions

View file

@ -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